fix: regen api spec

#### Description
- first slice of saved views in the quick filters sidebar..
`QuickFiltersLayout` gets a `savedViewProps` next to `quickFilterProps`,
both optional. views header sits above the filters, `≡` opens an All
views panel in the sidebar's place and the filters slide right over the
content as one drawer. nothing remounts, so expanded sections and an
open settings drawer survive the toggle.
- header and panel are placeholders for now (dummy name, empty list)..
this PR is the layout, the real header / list / actions come on top of
it. behind `SAVED_VIEW_ENABLED`, flag off is today's ui.
- metrics has no quick filters, so it gets the layout with only the
views side.. header on top, list always visible, nothing slides.
- logs explorer moved onto `QuickFiltersLayout`.. it was the last one
mounting quick filters on its own. content wrapper now hands a definite
height down so logs can keep sizing its list from the pane instead of
`calc(100vh - ..)`.
- quick filters settings drawer animates with transform instead of
width.. width relaid out the drawer every frame, that was the jitter.
clipped so it comes out from behind the filters.

#### Issues closed by this PR

Part of https://github.com/SigNoz/events-pod/issues/71


#### Screenshots/ Screen recording 

<img width="1728" height="1001" alt="12994 - metrics dummy section"
src="https://github.com/user-attachments/assets/7a57fd43-a11b-44e7-a8ca-4b197826bd36"
/>


https://github.com/user-attachments/assets/fd6a4ac4-6464-4059-9986-99d42e159a3d




#### Additional Information
- flag off checked on logs / traces / metrics / exceptions.. sidebar,
list scroll and pane scroll same as before.
- borders and l1 background per figma, quick filters width still 280px..
will take that up with design.
- cc. @H4ad since `QuickFiltersLayout` is from the scroll fix PR.

.gitattributes

@@ -1,4 +1,3 @@
 *.css linguist-detectable=false
 *.stories.mocks.tsx linguist-generated=true
 **/__story_mockdata__/** linguist-generated=true
-tests/e2e/drivers/** linguist-generated=true

docs/api/openapi.yml

@@ -3367,6 +3367,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:
@@ -4420,6 +4483,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'
@@ -4429,6 +4493,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'
@@ -4438,12 +4503,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:

docs/contributing/tests/e2e.md

@@ -86,9 +86,6 @@ tests/
     ├── .env.local             # generated by bootstrap/setup.py (gitignored)
     ├── bootstrap/
     │   └── setup.py           # test_setup / test_teardown — pytest lifecycle
-    ├── drivers/               # the driver kit and one driver per feature
-    │   ├── kit.ts
-    │   └── routing.ts
     ├── fixtures/              # Playwright test fixtures (test.extend) only
     │   └── auth.ts
     ├── helpers/               # function helpers + the constants they share with tests
@@ -115,24 +112,6 @@ These two folders look similar but mean different things:
 
 Rule of thumb: if it's a `test.extend` fixture, put it in `fixtures/`. If it's a function you call explicitly (or a constant the function uses), put it in `helpers/`. If it's a static file the helpers read, put it in `testdata/`.
 
-### Drivers
-
-New suites use a driver rather than loose helpers. A driver is a function that closes over the page and returns the feature's actions and locators. `drivers/kit.ts` turns it into a fixture, so a spec imports one module and never passes a `page` around:
-
-```ts
-import { expect, PATH, test } from '../../drivers/routing';
-
-test('TC-09 RouteTab switches the url', async ({ routing }) => {
-	await routing.goto(PATH.metricsSummary);
-	await expect(routing.activeRouteTab(PATH.metricsSummary)).toBeVisible();
-});
-```
-
-- `driver(name, build)` adds a test-scoped fixture built on `authedPage`.
-- `seeded(name, open, close)` adds a worker-scoped seed. `open` and `close` run on a throwaway admin page.
-- A driver reuses helpers by calling them, never by reaching for another fixture.
-- `drivers/` is AI-owned: coding agents generate and maintain it with the specs, and `.gitattributes` collapses it in diffs.
-
 ### Extended fixtures
 
 For features needing complex setup (API-seeded data, ruler evaluation waits, cleanup), create domain-specific fixtures that extend `auth`. Group them in `fixtures/<domain>/`.

frontend/scripts/story-shots.mjs

@@ -417,7 +417,7 @@ for (const theme of themes.length ? themes : [null]) {
 						break;
 					}
 
-					height = needed;
+					height = Math.ceil(needed);
 					await page.setViewportSize({ width: Number(opts.width), height });
 					await page.waitForTimeout(Number(opts.settle));
 				}

frontend/src/components/CustomTimePicker/CustomTimePicker.tsx

@@ -72,8 +72,6 @@ interface CustomTimePickerProps {
 	maxTime: number;
 	/** When true, zoom-out button is hidden (e.g. in drawer/modal time selection) */
 	isModalTimeSelection?: boolean;
-	/** Lands on the trigger input. Not spread — the component takes no rest props. */
-	'data-testid'?: string;
 }
 
 function CustomTimePicker({
@@ -97,7 +95,6 @@ function CustomTimePicker({
 	minTime,
 	maxTime,
 	isModalTimeSelection = false,
-	'data-testid': dataTestId,
 }: CustomTimePickerProps): JSX.Element {
 	const [selectedTimePlaceholderValue, setSelectedTimePlaceholderValue] =
 		useState('Select / Enter Time Range');
@@ -599,7 +596,6 @@ function CustomTimePicker({
 				>
 					<Input
 						ref={inputRef}
-						data-testid={dataTestId}
 						autoComplete="off"
 						className={cx(
 							'timeSelection-input',
@@ -686,5 +682,4 @@ CustomTimePicker.defaultProps = {
 	onExitLiveLogs: noop,
 	showLiveLogs: false,
 	showRecentlyUsed: true,
-	'data-testid': undefined,
 };

frontend/src/components/CustomTimePicker/CustomTimePickerPopoverContent.tsx

@@ -180,7 +180,6 @@ function CustomTimePickerPopoverContent({
 						type="text"
 						className="time-btns"
 						key={option.label + option.value}
-						data-testid={`time-chip-${option.value}`}
 						onClick={(): void => {
 							handleExitLiveLogs();
 							onSelectHandler(option.label, option.value);
@@ -260,7 +259,6 @@ function CustomTimePickerPopoverContent({
 						<Button
 							type="text"
 							key={option.label + option.value}
-							data-testid={`time-option-${option.value}`}
 							onClick={(e: React.MouseEvent<HTMLButtonElement>): void => {
 								e.stopPropagation();
 								e.preventDefault();

frontend/src/components/NotFound/__snapshots__/NotFound.test.tsx.snap

@@ -98,7 +98,6 @@ exports[`Not Found page test should render Not Found page without errors 1`] = `
 
 <div
     class="c0"
-    data-testid="not-found"
   >
     <img
       alt="not-found"

frontend/src/components/NotFound/index.tsx

@@ -6,7 +6,7 @@ import { Button, Container, Text, TextContainer } from './styles';
 
 function NotFound({ text = defaultText }: Props): JSX.Element {
 	return (
-		<Container data-testid="not-found">
+		<Container>
 			<NotFoundImage />
 
 			<TextContainer>

frontend/src/components/QuickFilters/QuickFilters.styles.scss

@@ -12,6 +12,7 @@
 		overflow: visible;
 		position: relative;
 		align-self: stretch;
+		clip-path: inset(0 -100vw 0 0);
 	}
 }
 

frontend/src/components/QuickFilters/QuickFilters.tsx

@@ -57,6 +57,7 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 		showFilterCollapse = true,
 		showQueryName = true,
 		useFieldApis,
+		savedViewsHeader,
 	} = props;
 	const [isSettingsOpen, setIsSettingsOpen] = useState(false);
 	const [params, setParams] = useApiMonitoringParams();
@@ -379,6 +380,7 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 	return (
 		<div className="quick-filters-container">
 			<div className="quick-filters">
+				{savedViewsHeader}
 				{source !== QuickFiltersSource.INFRA_MONITORING && (
 					<section className="header">
 						{renderLeftActions()}

frontend/src/components/QuickFilters/QuickFiltersLayout/QuickFiltersLayout.module.scss

@@ -8,9 +8,7 @@
 	overflow: hidden;
 }
 
-// Positioned so overlays (settings drawer) paint above the content pane
-// without changing this pane's layout width.
-.filters {
+.sidebar {
 	width: 280px;
 	flex-shrink: 0;
 	display: flex;
@@ -21,6 +19,44 @@
 	z-index: 2;
 }
 
+.savedViews {
+	flex: 1;
+	min-height: 0;
+	display: flex;
+	flex-direction: column;
+	background: var(--l1-background);
+	border-right: 1px solid var(--l1-border);
+}
+
+.quickFilters {
+	position: absolute;
+	inset: 0;
+	display: flex;
+	flex-direction: column;
+	min-height: 0;
+	background: var(--l1-background);
+	transition: transform 0.2s ease-in-out;
+	z-index: 1;
+
+	&.isOpen {
+		transform: translateX(100%);
+	}
+}
+
+// No quick filters: the header sits in flow and the list stays under it
+.isStatic {
+	border-right: 1px solid var(--l1-border);
+
+	.quickFilters {
+		position: static;
+		flex-shrink: 0;
+	}
+
+	.savedViews {
+		border-right: 0;
+	}
+}
+
 // Bounded box for the OverlayScrollbar inside it (`.overlay-scrollbar` is
 // `height: 100%`), which owns the scrolling.
 .content {
@@ -31,3 +67,7 @@
 	flex-direction: column;
 	overflow: hidden;
 }
+
+.contentInner {
+	height: 100%;
+}

frontend/src/components/QuickFilters/QuickFiltersLayout/QuickFiltersLayout.tsx

@@ -1,6 +1,9 @@
-import { ComponentProps, ReactNode } from 'react';
+import { ComponentProps, ReactNode, useState } from 'react';
 import cx from 'classnames';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
+import SavedViewsHeader from 'container/SavedViews/SavedViewsHeader';
+import SavedViewsPanel from 'container/SavedViews/SavedViewsPanel';
+import { useSavedViewEnabled } from 'hooks/useSavedViewEnabled';
 
 import QuickFilters from '../QuickFilters';
 
@@ -12,8 +15,15 @@ type QuickFiltersElementProps = JSX.LibraryManagedAttributes<
 	ComponentProps<typeof QuickFilters>
 >;
 
+// What the page configures; the layout adds the open / close wiring.
+type SavedViewsElementProps = Omit<
+	ComponentProps<typeof SavedViewsPanel>,
+	'onClose'
+>;
+
 export interface QuickFiltersLayoutProps {
-	quickFilterProps: QuickFiltersElementProps;
+	quickFilterProps?: QuickFiltersElementProps;
+	savedViewProps?: SavedViewsElementProps;
 	showFilters: boolean;
 	className?: string;
 	contentClassName?: string;
@@ -23,20 +33,60 @@ export interface QuickFiltersLayoutProps {
 
 function QuickFiltersLayout({
 	quickFilterProps,
+	savedViewProps,
 	showFilters,
 	className,
 	contentClassName,
 	testId,
 	children,
 }: QuickFiltersLayoutProps): JSX.Element {
+	const [isViewsOpen, setIsViewsOpen] = useState(false);
+	const isSavedViewEnabled = useSavedViewEnabled();
+
+	const hasQuickFilters = !!quickFilterProps;
+	const hasSavedViews = !!savedViewProps && isSavedViewEnabled;
+
+	const showSidebar = showFilters && (hasQuickFilters || hasSavedViews);
+
+	const isPanelPinned = hasSavedViews && !hasQuickFilters;
+
+	const isSliding = hasQuickFilters && isViewsOpen;
+
+	const savedViewsHeader = hasSavedViews ? (
+		<SavedViewsHeader
+			{...savedViewProps}
+			onOpenViews={isPanelPinned ? undefined : (): void => setIsViewsOpen(true)}
+		/>
+	) : undefined;
+
 	return (
 		<div className={cx(styles.layout, className)} data-testid={testId}>
-			{showFilters && (
+			{showSidebar && (
 				<aside
-					className={styles.filters}
+					className={cx(styles.sidebar, { [styles.isStatic]: !hasQuickFilters })}
 					data-testid="quick-filters-layout-filters"
 				>
-					<QuickFilters {...quickFilterProps} />
+					<div
+						className={cx(styles.quickFilters, { [styles.isOpen]: isSliding })}
+						data-testid="quick-filters-layout-drawer"
+					>
+						{hasQuickFilters ? (
+							<QuickFilters
+								{...quickFilterProps}
+								savedViewsHeader={savedViewsHeader}
+							/>
+						) : (
+							savedViewsHeader
+						)}
+					</div>
+					<div className={styles.savedViews}>
+						{hasSavedViews && (isPanelPinned || isViewsOpen) && (
+							<SavedViewsPanel
+								{...savedViewProps}
+								onClose={isPanelPinned ? undefined : (): void => setIsViewsOpen(false)}
+							/>
+						)}
+					</div>
 				</aside>
 			)}
 			<section
@@ -44,7 +94,7 @@ function QuickFiltersLayout({
 				data-testid="quick-filters-layout-content"
 			>
 				<OverlayScrollbar>
-					<div>{children}</div>
+					<div className={styles.contentInner}>{children}</div>
 				</OverlayScrollbar>
 			</section>
 		</div>

frontend/src/components/QuickFilters/QuickFiltersLayout/__tests__/QuickFiltersLayout.test.tsx

@@ -1,4 +1,6 @@
-import { render, screen } from 'tests/test-utils';
+import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
+import { useSavedViewEnabled } from 'hooks/useSavedViewEnabled';
+import { render, screen, userEvent } from 'tests/test-utils';
 
 import { QuickFiltersSource } from '../../types';
 import QuickFiltersLayout from '../QuickFiltersLayout';
@@ -7,15 +9,33 @@ jest.mock('../QuickFiltersLayout.module.scss', () => ({
 	__esModule: true,
 	default: {
 		layout: 'layout',
-		filters: 'filters',
+		sidebar: 'sidebar',
+		isStatic: 'isStatic',
+		savedViews: 'savedViews',
+		quickFilters: 'quickFilters',
+		isOpen: 'isOpen',
 		content: 'content',
+		contentInner: 'contentInner',
 	},
 }));
 
+jest.mock('hooks/useSavedViewEnabled', () => ({
+	useSavedViewEnabled: jest.fn(() => true),
+}));
+
 jest.mock('../../QuickFilters', () => ({
 	__esModule: true,
-	default: ({ source }: { source: string }): JSX.Element => (
-		<div data-testid="quick-filters">{source}</div>
+	default: ({
+		source,
+		savedViewsHeader,
+	}: {
+		source: string;
+		savedViewsHeader?: React.ReactNode;
+	}): JSX.Element => (
+		<div data-testid="quick-filters">
+			{savedViewsHeader}
+			{source}
+		</div>
 	),
 }));
 
@@ -23,8 +43,16 @@ const quickFilterProps = {
 	source: QuickFiltersSource.TRACES_EXPLORER,
 	handleFilterVisibilityChange: jest.fn(),
 };
+const savedViewProps = { source: SavedviewtypesSourceDTO.traces };
+
+const drawer = (): HTMLElement =>
+	screen.getByTestId('quick-filters-layout-drawer');
 
 describe('QuickFiltersLayout', () => {
+	beforeEach(() => {
+		jest.mocked(useSavedViewEnabled).mockReturnValue(true);
+	});
+
 	it('renders QuickFilters with the given props inside the filters pane', () => {
 		render(
 			<QuickFiltersLayout showFilters quickFilterProps={quickFilterProps}>
@@ -40,11 +68,16 @@ describe('QuickFiltersLayout', () => {
 		expect(screen.getByTestId('quick-filters-layout-content')).toHaveTextContent(
 			'content',
 		);
+		expect(screen.queryByTestId('saved-views-header')).not.toBeInTheDocument();
 	});
 
 	it('does not render the filters pane when showFilters is false', () => {
 		render(
-			<QuickFiltersLayout showFilters={false} quickFilterProps={quickFilterProps}>
+			<QuickFiltersLayout
+				showFilters={false}
+				quickFilterProps={quickFilterProps}
+				savedViewProps={savedViewProps}
+			>
 				<div>content</div>
 			</QuickFiltersLayout>,
 		);
@@ -56,24 +89,138 @@ describe('QuickFiltersLayout', () => {
 		expect(screen.getByText('content')).toBeInTheDocument();
 	});
 
+	it('renders no sidebar at all without quick filters or saved views', () => {
+		render(
+			<QuickFiltersLayout showFilters>
+				<div>content</div>
+			</QuickFiltersLayout>,
+		);
+
+		expect(
+			screen.queryByTestId('quick-filters-layout-filters'),
+		).not.toBeInTheDocument();
+		expect(screen.getByText('content')).toBeInTheDocument();
+	});
+
 	it('merges classNames onto the root and content panes', () => {
 		render(
 			<QuickFiltersLayout
 				showFilters
 				quickFilterProps={quickFilterProps}
-				className="page-root"
-				contentClassName="page-content"
-				testId="page"
+				className="root-extra"
+				contentClassName="content-extra"
+				testId="layout"
 			>
 				<div>content</div>
 			</QuickFiltersLayout>,
 		);
 
-		const root = screen.getByTestId('page');
-		expect(root).toHaveClass('layout', 'page-root');
+		expect(screen.getByTestId('layout')).toHaveClass('layout', 'root-extra');
 		expect(screen.getByTestId('quick-filters-layout-content')).toHaveClass(
 			'content',
-			'page-content',
+			'content-extra',
 		);
 	});
+
+	describe('saved views', () => {
+		it('ignores savedViewProps while the flag is off', () => {
+			jest.mocked(useSavedViewEnabled).mockReturnValue(false);
+			const { unmount } = render(
+				<QuickFiltersLayout
+					showFilters
+					quickFilterProps={quickFilterProps}
+					savedViewProps={savedViewProps}
+				>
+					<div>content</div>
+				</QuickFiltersLayout>,
+			);
+
+			expect(screen.getByTestId('quick-filters')).toBeInTheDocument();
+			expect(screen.queryByTestId('saved-views-header')).not.toBeInTheDocument();
+			expect(screen.queryByTestId('saved-views-panel')).not.toBeInTheDocument();
+
+			// Saved views only, so nothing is left to show.
+			unmount();
+			render(
+				<QuickFiltersLayout showFilters savedViewProps={savedViewProps}>
+					<div>content</div>
+				</QuickFiltersLayout>,
+			);
+			expect(
+				screen.queryByTestId('quick-filters-layout-filters'),
+			).not.toBeInTheDocument();
+		});
+
+		it('opens the panel from the header and slides the quick filters drawer, keeping the same QuickFilters node', async () => {
+			render(
+				<QuickFiltersLayout
+					showFilters
+					quickFilterProps={quickFilterProps}
+					savedViewProps={savedViewProps}
+				>
+					<div>content</div>
+				</QuickFiltersLayout>,
+			);
+			const user = userEvent.setup();
+			const quickFilters = screen.getByTestId('quick-filters');
+
+			expect(quickFilters).toContainElement(
+				screen.getByTestId('saved-views-header'),
+			);
+			expect(drawer()).toContainElement(quickFilters);
+			expect(screen.queryByTestId('saved-views-panel')).not.toBeInTheDocument();
+			expect(drawer()).not.toHaveClass('isOpen');
+
+			await user.click(screen.getByTestId('saved-views-open'));
+
+			expect(screen.getByTestId('saved-views-panel')).toBeInTheDocument();
+			expect(drawer()).toHaveClass('isOpen');
+			expect(screen.getByTestId('quick-filters')).toBe(quickFilters);
+
+			await user.click(screen.getByTestId('saved-views-close'));
+
+			expect(screen.queryByTestId('saved-views-panel')).not.toBeInTheDocument();
+			expect(drawer()).not.toHaveClass('isOpen');
+			expect(screen.getByTestId('quick-filters')).toBe(quickFilters);
+		});
+
+		it('hands the source to the header and the panel', async () => {
+			render(
+				<QuickFiltersLayout
+					showFilters
+					quickFilterProps={quickFilterProps}
+					savedViewProps={savedViewProps}
+				>
+					<div>content</div>
+				</QuickFiltersLayout>,
+			);
+
+			expect(screen.getByTestId('saved-views-header')).toHaveAttribute(
+				'data-source',
+				SavedviewtypesSourceDTO.traces,
+			);
+			await userEvent.setup().click(screen.getByTestId('saved-views-open'));
+			expect(screen.getByTestId('saved-views-panel')).toHaveAttribute(
+				'data-source',
+				SavedviewtypesSourceDTO.traces,
+			);
+		});
+
+		it('without quick filters: static sidebar, header on top, list always on screen with no open or close controls', () => {
+			render(
+				<QuickFiltersLayout showFilters savedViewProps={savedViewProps}>
+					<div>content</div>
+				</QuickFiltersLayout>,
+			);
+
+			const sidebar = screen.getByTestId('quick-filters-layout-filters');
+			expect(sidebar).toHaveClass('isStatic');
+			expect(screen.queryByTestId('quick-filters')).not.toBeInTheDocument();
+			expect(screen.getByTestId('saved-views-header')).toBeInTheDocument();
+			expect(screen.getByTestId('saved-views-panel')).toBeInTheDocument();
+			expect(screen.queryByTestId('saved-views-open')).not.toBeInTheDocument();
+			expect(screen.queryByTestId('saved-views-close')).not.toBeInTheDocument();
+			expect(drawer()).not.toHaveClass('isOpen');
+		});
+	});
 });

frontend/src/components/QuickFilters/QuickFiltersSettings/QuickFiltersSettings.styles.scss

@@ -8,12 +8,20 @@
 	width: 342px;
 	height: 100%;
 	background: var(--l1-background);
-	transition: width 0.05s ease-in-out;
+	border-right: 1px solid var(--l1-border);
 	overflow: hidden;
 	color: var(--l1-foreground);
+	transition:
+		transform 0.2s ease-in-out,
+		visibility 0s;
 
 	&.hidden {
-		width: 0;
+		transform: translateX(-100%);
+		visibility: hidden;
+		pointer-events: none;
+		transition:
+			transform 0.2s ease-in-out,
+			visibility 0s 0.2s;
 	}
 	.qf-header {
 		display: flex;

frontend/src/components/QuickFilters/types.ts

@@ -1,3 +1,4 @@
+import { ReactNode } from 'react';
 import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
@@ -61,6 +62,7 @@ export interface IQuickFiltersProps {
 	showFilterCollapse?: boolean;
 	showQueryName?: boolean;
 	useFieldApis?: QuickFilterCheckboxUseFieldApis;
+	savedViewsHeader?: ReactNode;
 }
 
 export enum QuickFiltersSource {

frontend/src/components/TanStackTableView/TanStackRowCell.tsx

@@ -35,8 +35,7 @@ function TanStackRowCellInner<TData>({
 		<td
 			className={cx(tableStyles.tableCell, 'tanstack-cell-' + cell.column.id)}
 			data-single-column={hasSingleColumn || undefined}
-			// While loading, rowData may be a placeholder ({ id: 'skeleton-N' }).
-			onClick={showSkeleton ? undefined : onClick}
+			onClick={onClick}
 		>
 			{showSkeleton ? (
 				<Skeleton.Input

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

@@ -83,18 +83,6 @@ describe('TanStackTableView Integration', () => {
 			expect(screen.getByRole('table')).toBeInTheDocument();
 		});
 
-		it('does not call onRowClick for skeleton rows', async () => {
-			const user = userEvent.setup();
-			const onRowClick = jest.fn();
-			renderTanStackTable({
-				props: { data: [], isLoading: true, onRowClick },
-			});
-
-			await user.click(screen.getAllByRole('cell')[0]);
-
-			expect(onRowClick).not.toHaveBeenCalled();
-		});
-
 		it('shows loading spinner for infinite scroll when loading', () => {
 			renderTanStackTable({
 				props: { isLoading: true, onEndReached: jest.fn() },

frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx

@@ -10,6 +10,8 @@ import WarningPopover from 'components/WarningPopover/WarningPopover';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import { usePageActions } from 'container/AIAssistant/pageActions/usePageActions';
+import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
+import QuickFiltersLayout from 'components/QuickFilters/QuickFiltersLayout/QuickFiltersLayout';
 import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';
 import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';
 import DateTimeSelector from 'container/TopNav/DateTimeSelectionV2';
@@ -347,57 +349,62 @@ function Explorer(): JSX.Element {
 
 	return (
 		<Sentry.ErrorBoundary fallback={<ErrorBoundaryFallback />}>
-			<div className="metrics-explorer-explore-container">
-				<div className="explore-header">
-					<div className="explore-header-left-actions">
-						<span>1 chart/query</span>
-						<Tooltip
-							open={disableOneChartPerQuery ? undefined : false}
-							title={oneChartPerQueryDisabledTooltip}
-						>
-							<Switch
-								value={showOneChartPerQuery}
-								onChange={handleToggleShowOneChartPerQuery}
-								disabled={disableOneChartPerQuery || splitedQueries.length <= 1}
+			<QuickFiltersLayout
+				showFilters
+				savedViewProps={{ source: SavedviewtypesSourceDTO.metrics }}
+			>
+				<div className="metrics-explorer-explore-container">
+					<div className="explore-header">
+						<div className="explore-header-left-actions">
+							<span>1 chart/query</span>
+							<Tooltip
+								open={disableOneChartPerQuery ? undefined : false}
+								title={oneChartPerQueryDisabledTooltip}
+							>
+								<Switch
+									value={showOneChartPerQuery}
+									onChange={handleToggleShowOneChartPerQuery}
+									disabled={disableOneChartPerQuery || splitedQueries.length <= 1}
+								/>
+							</Tooltip>
+						</div>
+						<div className="explore-header-right-actions">
+							{!isEmpty(warning) && <WarningPopover warningData={warning} />}
+							<DateTimeSelector showAutoRefresh />
+							<RightToolbarActions
+								onStageRunQuery={(): void => handleRunQuery()}
+								isLoadingQueries={isLoadingQueries}
+								handleCancelQuery={handleCancelQuery}
 							/>
-						</Tooltip>
+						</div>
 					</div>
-					<div className="explore-header-right-actions">
-						{!isEmpty(warning) && <WarningPopover warningData={warning} />}
-						<DateTimeSelector showAutoRefresh />
-						<RightToolbarActions
-							onStageRunQuery={(): void => handleRunQuery()}
-							isLoadingQueries={isLoadingQueries}
-							handleCancelQuery={handleCancelQuery}
+					<QueryBuilderV2
+						config={{ initialDataSource: DataSource.METRICS, queryVariant: 'static' }}
+						panelType={PANEL_TYPES.TIME_SERIES}
+						showFunctions={false}
+						version="v3"
+					/>
+					<div className="explore-content">
+						<TimeSeries
+							onFetchingStateChange={setIsLoadingQueries}
+							showOneChartPerQuery={showOneChartPerQuery}
+							setWarning={setWarning}
+							areAllMetricUnitsSame={areAllMetricUnitsSame}
+							isMetricUnitsLoading={isMetricUnitsLoading}
+							isMetricUnitsError={isMetricUnitsError}
+							metricUnits={units}
+							metricNames={metricNames}
+							metrics={metrics}
+							handleOpenMetricDetails={handleOpenMetricDetails}
+							yAxisUnit={yAxisUnit}
+							setYAxisUnit={setYAxisUnit}
+							showYAxisUnitSelector={showYAxisUnitSelector}
+							isCancelled={isCancelled}
+							exportDefaultQuery={exportDefaultQuery}
 						/>
 					</div>
 				</div>
-				<QueryBuilderV2
-					config={{ initialDataSource: DataSource.METRICS, queryVariant: 'static' }}
-					panelType={PANEL_TYPES.TIME_SERIES}
-					showFunctions={false}
-					version="v3"
-				/>
-				<div className="explore-content">
-					<TimeSeries
-						onFetchingStateChange={setIsLoadingQueries}
-						showOneChartPerQuery={showOneChartPerQuery}
-						setWarning={setWarning}
-						areAllMetricUnitsSame={areAllMetricUnitsSame}
-						isMetricUnitsLoading={isMetricUnitsLoading}
-						isMetricUnitsError={isMetricUnitsError}
-						metricUnits={units}
-						metricNames={metricNames}
-						metrics={metrics}
-						handleOpenMetricDetails={handleOpenMetricDetails}
-						yAxisUnit={yAxisUnit}
-						setYAxisUnit={setYAxisUnit}
-						showYAxisUnitSelector={showYAxisUnitSelector}
-						isCancelled={isCancelled}
-						exportDefaultQuery={exportDefaultQuery}
-					/>
-				</div>
-			</div>
+			</QuickFiltersLayout>
 			<ExplorerOptionWrapper
 				disabled={!stagedQuery}
 				query={exportDefaultQuery}

frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.tsx

@@ -308,7 +308,7 @@ function CreateEditRolePageContent(): JSX.Element {
 				cancelText="Keep editing"
 				onConfirm={confirmNavigation}
 				onCancel={cancelNavigation}
-				testId="discard-changes-dialog"
+				data-testid="discard-changes-dialog"
 			>
 				<Typography>
 					{isCreateMode

frontend/src/container/SavedViews/SavedViewsHeader.module.scss

@@ -0,0 +1,19 @@
+.header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: var(--spacing-2);
+	padding: var(--spacing-2) var(--spacing-3);
+	border-bottom: 1px solid var(--l1-border);
+	color: var(--l1-foreground);
+	flex-shrink: 0;
+}
+
+.name {
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-size: var(--font-size-sm);
+	font-weight: var(--font-weight-medium);
+}

frontend/src/container/SavedViews/SavedViewsHeader.tsx

@@ -0,0 +1,43 @@
+import { Menu } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
+import { Typography } from '@signozhq/ui/typography';
+import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
+
+import styles from './SavedViewsHeader.module.scss';
+
+// Temp Placeholder data till main functionality is plugged in
+const PLACEHOLDER_VIEW_NAME = 'My view';
+
+function SavedViewsHeader({
+	source,
+	onOpenViews,
+}: {
+	source: SavedviewtypesSourceDTO;
+	// Absent when the list is always on screen.
+	onOpenViews?: () => void;
+}): JSX.Element {
+	return (
+		<div
+			className={styles.header}
+			data-testid="saved-views-header"
+			data-source={source}
+		>
+			<Typography.Text className={styles.name}>
+				{PLACEHOLDER_VIEW_NAME}
+			</Typography.Text>
+			{onOpenViews && (
+				<Button
+					variant="ghost"
+					color="secondary"
+					size="icon"
+					aria-label="All views"
+					prefix={<Menu size={14} />}
+					onClick={onOpenViews}
+					data-testid="saved-views-open"
+				/>
+			)}
+		</div>
+	);
+}
+
+export default SavedViewsHeader;

frontend/src/container/SavedViews/SavedViewsPanel.module.scss

@@ -0,0 +1,21 @@
+.panel {
+	display: flex;
+	flex-direction: column;
+	flex: 1;
+	min-height: 0;
+	color: var(--l1-foreground);
+}
+
+.header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: var(--spacing-2) var(--spacing-3);
+	border-bottom: 1px solid var(--l1-border);
+	flex-shrink: 0;
+}
+
+.title {
+	font-size: var(--font-size-sm);
+	font-weight: var(--font-weight-medium);
+}

frontend/src/container/SavedViews/SavedViewsPanel.tsx

@@ -0,0 +1,40 @@
+import { X } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
+import { Typography } from '@signozhq/ui/typography';
+import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
+
+import styles from './SavedViewsPanel.module.scss';
+
+function SavedViewsPanel({
+	source,
+	onClose,
+}: {
+	source: SavedviewtypesSourceDTO;
+	// Absent when the list is always on screen.
+	onClose?: () => void;
+}): JSX.Element {
+	return (
+		<div
+			className={styles.panel}
+			data-testid="saved-views-panel"
+			data-source={source}
+		>
+			<div className={styles.header}>
+				<Typography.Text className={styles.title}>All views</Typography.Text>
+				{onClose && (
+					<Button
+						variant="ghost"
+						color="secondary"
+						size="icon"
+						aria-label="Close"
+						prefix={<X size={14} />}
+						onClick={onClose}
+						data-testid="saved-views-close"
+					/>
+				)}
+			</div>
+		</div>
+	);
+}
+
+export default SavedViewsPanel;

frontend/src/pages/DashboardPage/PanelEditorPage/stories/PanelEditorPage.stories.tsx

@@ -2,6 +2,7 @@ import type { ComponentType } from 'react';
 import type { Meta, StoryObj } from '@storybook/react-vite';
 import { Route } from 'react-router-dom';
 import ROUTES from 'constants/routes';
+import { userEvent, within } from 'storybook/test';
 
 import { storyMocks } from '@/storybook/controls/defineStoryMocks';
 import type { PageStoryArgs } from '@/storybook/runtime/resolveStory';
@@ -22,6 +23,7 @@ const pageStory = storyMocks(panelEditorMocks, { layout: 'app' });
  */
 const meta = {
 	title: 'Pages/Dashboards/Panel Editor',
+	tags: ['play'],
 	// The page is wrapped in `withAuthZPage`, which types its props as an index
 	// signature; the story's args are what the controls resolve to.
 	component: PanelEditorPage as ComponentType<PanelEditorArgs>,
@@ -38,6 +40,25 @@ export default meta;
 
 type Story = StoryObj<PanelEditorArgs>;
 
+const expandConfigSections: Story['play'] = async ({ canvasElement }) => {
+	const canvas = within(canvasElement);
+
+	const headers = await canvas.findAllByTestId(
+		/^config-section-/,
+		{},
+		{ timeout: 10000 },
+	);
+	for (const header of headers) {
+		if (header.getAttribute('aria-expanded') === 'false') {
+			await userEvent.click(header);
+		}
+	}
+	(document.activeElement as HTMLElement | null)?.blur();
+	for (let el = headers[0].parentElement; el; el = el.parentElement) {
+		el.scrollTop = 0;
+	}
+};
+
 /**
  * Editing a saved time series panel: the live preview over the query builder on
  * the left, the panel's formatting, legend, axes and thresholds on the right.
@@ -86,3 +107,57 @@ export const ReadOnly: Story = {
 export const Tooltips: Story = {
 	args: { tooltipsOpen: true },
 };
+
+/** A new time series panel's config pane, every section expanded. */
+export const ConfigTimeSeries: Story = {
+	args: { panel: 'new', newPanelKind: 'time-series' },
+	play: expandConfigSections,
+};
+
+/** A new number panel's config pane, every section expanded. */
+export const ConfigNumber: Story = {
+	args: { panel: 'new', newPanelKind: 'number' },
+	play: expandConfigSections,
+};
+
+/** A new table panel's config pane, every section expanded. */
+export const ConfigTable: Story = {
+	args: { panel: 'new', newPanelKind: 'table' },
+	play: expandConfigSections,
+};
+
+/** A new bar chart panel's config pane, every section expanded. */
+export const ConfigBarChart: Story = {
+	args: { panel: 'new', newPanelKind: 'bar-chart' },
+	play: expandConfigSections,
+};
+
+/** A new area chart panel's config pane, every section expanded. */
+export const ConfigAreaChart: Story = {
+	args: { panel: 'new', newPanelKind: 'area-chart' },
+	play: expandConfigSections,
+};
+
+/** A new pie chart panel's config pane, every section expanded. */
+export const ConfigPieChart: Story = {
+	args: { panel: 'new', newPanelKind: 'pie-chart' },
+	play: expandConfigSections,
+};
+
+/** A new histogram panel's config pane, every section expanded. */
+export const ConfigHistogram: Story = {
+	args: { panel: 'new', newPanelKind: 'histogram' },
+	play: expandConfigSections,
+};
+
+/** A new list panel's config pane, every section expanded. */
+export const ConfigList: Story = {
+	args: { panel: 'new', newPanelKind: 'list' },
+	play: expandConfigSections,
+};
+
+/** A new text panel's config pane, every section expanded. */
+export const ConfigText: Story = {
+	args: { panel: 'new', newPanelKind: 'text' },
+	play: expandConfigSections,
+};

frontend/src/pages/DashboardPage/PanelEditorPage/stories/__story_mockdata__/panelEditor.ts

@@ -21,12 +21,14 @@ import type { PanelKind } from '../../../DashboardContainer/Panels/types/panelKi
  */
 export const NEW_PANEL_KINDS = [
 	'time-series',
-	'bar-chart',
 	'number',
-	'pie-chart',
 	'table',
+	'bar-chart',
+	'area-chart',
+	'pie-chart',
 	'histogram',
 	'list',
+	'text',
 ] as const;
 
 export type NewPanelKind = (typeof NEW_PANEL_KINDS)[number];
@@ -34,11 +36,13 @@ export type NewPanelKind = (typeof NEW_PANEL_KINDS)[number];
 const KIND_BY_OPTION: Record<NewPanelKind, PanelKind> = {
 	'time-series': 'signoz/TimeSeriesPanel',
 	'bar-chart': 'signoz/BarChartPanel',
+	'area-chart': 'signoz/AreaChartPanel',
 	number: 'signoz/NumberPanel',
 	'pie-chart': 'signoz/PieChartPanel',
 	table: 'signoz/TablePanel',
 	histogram: 'signoz/HistogramPanel',
 	list: 'signoz/ListPanel',
+	text: 'signoz/TextPanel',
 };
 
 export const newPanelKindOf = (option: NewPanelKind): PanelKind =>

frontend/src/pages/DashboardPage/stories/DashboardPage.stories.tsx

@@ -285,6 +285,70 @@ export const SectionActionsMenu: Story = {
 	},
 };
 
+/**
+ * The new-panel picker opened from the toolbar: the panel kinds as tiles, with
+ * the target section to place the panel in.
+ */
+export const NewPanelPicker: Story = {
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+
+		await userEvent.click(
+			await canvas.findByTestId('add-panel-header', {}, { timeout: 10000 }),
+		);
+		await screen.findByTestId('panel-type-signoz/TimeSeriesPanel');
+	},
+};
+
+/** The new-panel picker with a kind picked, waiting on the section to confirm. */
+export const NewPanelPickerTypeSelected: Story = {
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+
+		await userEvent.click(
+			await canvas.findByTestId('add-panel-header', {}, { timeout: 10000 }),
+		);
+		await userEvent.click(
+			await screen.findByTestId('panel-type-signoz/TimeSeriesPanel'),
+		);
+	},
+};
+
+/**
+ * The new-panel picker on a dashboard without sections, where there is no
+ * section to choose.
+ */
+export const NewPanelPickerNoSections: Story = {
+	args: { sectioned: false },
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+
+		await userEvent.click(
+			await canvas.findByTestId('add-panel-header', {}, { timeout: 10000 }),
+		);
+		await screen.findByTestId('panel-type-signoz/TimeSeriesPanel');
+	},
+};
+
+/**
+ * The new-panel picker opened from the second section's menu, targeting that
+ * section.
+ */
+export const NewPanelPickerFromSection: Story = {
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+
+		const [, secondSection] = await canvas.findAllByRole(
+			'button',
+			{ name: 'Section actions' },
+			{ timeout: 10000 },
+		);
+		await userEvent.click(secondSection);
+		await userEvent.click(await screen.findByText('Add panel'));
+		await screen.findByTestId('panel-type-signoz/TimeSeriesPanel');
+	},
+};
+
 /**
  * A dashboard id nobody has, which is what a deleted or mistyped link opens on.
  *

frontend/src/pages/LogsExplorer/LogsExplorer.styles.scss

@@ -4,15 +4,10 @@
 	min-height: 0;
 	overflow: hidden;
 
-	.log-quick-filter-left-section {
-		width: 0%;
-		flex-shrink: 0;
-	}
-
 	.log-module-right-section {
 		display: flex;
 		flex-direction: column;
-		width: 100%;
+		height: 100%;
 		min-height: 0;
 
 		.log-explorer-query-container {
@@ -39,26 +34,4 @@
 			}
 		}
 	}
-
-	&.filter-visible {
-		.log-quick-filter-left-section {
-			width: 260px;
-			height: 100%;
-			overflow: visible;
-			min-height: 0;
-			position: relative;
-			z-index: 2;
-			display: flex;
-			flex-direction: column;
-
-			.quick-filters-container {
-				flex: 1;
-				min-height: 0;
-			}
-		}
-
-		.log-module-right-section {
-			width: calc(100% - 260px);
-		}
-	}
 }

frontend/src/pages/LogsExplorer/index.tsx

@@ -3,10 +3,10 @@ import { useQueryClient } from 'react-query';
 import * as Sentry from '@sentry/react';
 import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageApi from 'api/browser/localstorage/set';
-import cx from 'classnames';
 import ExplorerCard from 'components/ExplorerCard/ExplorerCard';
 import QueryCancelledPlaceholder from 'components/QueryCancelledPlaceholder';
-import QuickFilters from 'components/QuickFilters/QuickFilters';
+import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
+import QuickFiltersLayout from 'components/QuickFilters/QuickFiltersLayout/QuickFiltersLayout';
 import { useSignalFieldApis } from 'components/QuickFilters/hooks/useSignalFieldApis';
 import { QuickFiltersSource, SignalType } from 'components/QuickFilters/types';
 import WarningPopover from 'components/WarningPopover/WarningPopover';
@@ -225,21 +225,19 @@ function LogsExplorer(): JSX.Element {
 	return (
 		<Sentry.ErrorBoundary fallback={<ErrorBoundaryFallback />}>
 			<EventSourceProvider>
-				<div
-					className={cx('logs-module-page', showFilters ? 'filter-visible' : '')}
+				<QuickFiltersLayout
+					className="logs-module-page"
+					showFilters={showFilters}
+					savedViewProps={{ source: SavedviewtypesSourceDTO.logs }}
+					quickFilterProps={{
+						className: 'qf-logs-explorer',
+						signal: SignalType.LOGS,
+						source: QuickFiltersSource.LOGS_EXPLORER,
+						handleFilterVisibilityChange,
+						useFieldApis: quickFilterFieldApis,
+					}}
 				>
-					{showFilters && (
-						<section className={cx('log-quick-filter-left-section')}>
-							<QuickFilters
-								className="qf-logs-explorer"
-								signal={SignalType.LOGS}
-								source={QuickFiltersSource.LOGS_EXPLORER}
-								handleFilterVisibilityChange={handleFilterVisibilityChange}
-								useFieldApis={quickFilterFieldApis}
-							/>
-						</section>
-					)}
-					<section className={cx('log-module-right-section')}>
+					<section className="log-module-right-section">
 						<Toolbar
 							showAutoRefresh={false}
 							leftActions={
@@ -292,7 +290,7 @@ function LogsExplorer(): JSX.Element {
 							</div>
 						</div>
 					</section>
-				</div>
+				</QuickFiltersLayout>
 			</EventSourceProvider>
 		</Sentry.ErrorBoundary>
 	);

frontend/src/pages/TracesExplorer/index.tsx

@@ -5,6 +5,7 @@ import * as Sentry from '@sentry/react';
 import logEvent from 'api/common/logEvent';
 import ExplorerCard from 'components/ExplorerCard/ExplorerCard';
 import QueryCancelledPlaceholder from 'components/QueryCancelledPlaceholder';
+import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
 import QuickFiltersLayout from 'components/QuickFilters/QuickFiltersLayout/QuickFiltersLayout';
 import { useSignalFieldApis } from 'components/QuickFilters/hooks/useSignalFieldApis';
 import { QuickFiltersSource, SignalType } from 'components/QuickFilters/types';
@@ -285,6 +286,7 @@ function TracesExplorer(): JSX.Element {
 			<QuickFiltersLayout
 				className="trace-explorer-page"
 				showFilters={isOpen}
+				savedViewProps={{ source: SavedviewtypesSourceDTO.traces }}
 				quickFilterProps={{
 					className: 'qf-traces-explorer',
 					source: QuickFiltersSource.TRACES_EXPLORER,

pkg/types/dashboardtypes/perses_dashboard_data.go

@@ -157,6 +157,7 @@ func (d *DashboardSpec) validateQuery(qi int, q Query, panelKind PanelPluginKind
 func validateQueryAllowedForPanel(plugin QueryPlugin, allowed []QueryPluginKind, panelKind PanelPluginKind, path string) error {
 	compositeSubQueryTypeToPluginKind := map[qb.QueryType]QueryPluginKind{
 		qb.QueryTypeBuilder:       QueryKindBuilder,
+		qb.QueryTypeBuilderAI:     QueryKindAIBuilder,
 		qb.QueryTypeFormula:       QueryKindFormula,
 		qb.QueryTypeTraceOperator: QueryKindTraceOperator,
 		qb.QueryTypePromQL:        QueryKindPromQL,

pkg/types/dashboardtypes/perses_dashboard_stats_test.go

@@ -117,6 +117,22 @@ func TestNewStatsFromStorableDashboardsCountsCompositeSubQueries(t *testing.T) {
 	assert.Equal(t, int64(1), stats[statKeyPanelLogsCount])
 }
 
+// An AI builder query is always a traces query, so it counts towards traces.
+func TestNewStatsFromStorableDashboardsCountsAIBuilderQueries(t *testing.T) {
+	aiBuilder := `{
+		"kind": "time_series",
+		"spec": {"plugin": {"kind": "signoz/AIBuilderQuery", "spec": {"name": "A", "aggregations": [{"expression": "count()"}]}}}
+	}`
+	dashboard := newStatsStorableV2(t, `"p1": `+statsPanel(aiBuilder))
+
+	stats := NewStatsFromStorableDashboards([]*StorableDashboard{dashboard})
+
+	assert.Equal(t, int64(1), stats[statKeyPanelCount])
+	assert.Equal(t, int64(1), stats[statKeyPanelTracesCount])
+	assert.Equal(t, int64(0), stats[statKeyPanelMetricsCount])
+	assert.Equal(t, int64(0), stats[statKeyPanelLogsCount])
+}
+
 // promql and clickhouse queries carry no signal, so they land in the panel total
 // and nowhere else.
 func TestNewStatsFromStorableDashboardsIgnoresSignallessQueries(t *testing.T) {

pkg/types/dashboardtypes/perses_dashboard_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/SigNoz/signoz/pkg/errors"
 	qb "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/perses/spec/go/dashboard"
 	"github.com/stretchr/testify/assert"
@@ -2020,6 +2021,43 @@ func TestStorageRoundTrip(t *testing.T) {
 	assert.Contains(t, responseStr, `"operator":"above"`, "expected operator:above after storage round-trip")
 }
 
+// An AI builder query carries no signal of its own: the plugin kind implies
+// gen_ai, which only reads traces, so decode pins the signal and marshal emits it.
+func TestAIBuilderQueryStorageRoundTrip(t *testing.T) {
+	input := []byte(`{
+		"variables": [],
+		"panels": {"p1": {"kind": "Panel", "spec": {
+			"links": [],
+			"plugin": {"kind": "signoz/TimeSeriesPanel", "spec": {}},
+			"queries": [{"kind": "time_series", "spec": {"plugin": {"kind": "signoz/AIBuilderQuery", "spec": {
+				"name": "A", "aggregations": [{"expression": "count()"}]
+			}}}}]
+		}}},
+		"links": [],
+		"layouts": []
+	}`)
+
+	d, err := unmarshalDashboard(input)
+	require.NoError(t, err)
+
+	plugin := d.Panels["p1"].Spec.Queries[0].Spec.Plugin
+	assert.Equal(t, QueryKindAIBuilder, plugin.Kind)
+
+	aiSpec, ok := plugin.Spec.(*AIBuilderQuerySpec)
+	require.True(t, ok, "expected *AIBuilderQuerySpec, got %T", plugin.Spec)
+	assert.Equal(t, "A", aiSpec.Name)
+	assert.Equal(t, telemetrytypes.SignalTraces, aiSpec.Signal)
+
+	stored, err := json.Marshal(plugin)
+	require.NoError(t, err)
+	assert.Contains(t, string(stored), `"kind":"signoz/AIBuilderQuery"`)
+	assert.Contains(t, string(stored), `"signal":"traces"`)
+
+	var loaded QueryPlugin
+	require.NoError(t, json.Unmarshal(stored, &loaded))
+	assert.Equal(t, plugin, loaded)
+}
+
 func TestPostableDashboardV2GenerateNameFlag(t *testing.T) {
 	const validSpec = `"spec": {"variables": [], "panels": {}, "layouts": [], "links": []}`
 
@@ -2232,6 +2270,8 @@ func TestPanelTypeQueryTypeCompatibility(t *testing.T) {
 		{"TimeSeries+PromQL", mkQuery("signoz/TimeSeriesPanel", "signoz/PromQLQuery", `{"name":"A","query":"up"}`), false},
 		{"Table+ClickHouse", mkQuery("signoz/TablePanel", "signoz/ClickHouseSQL", `{"name":"A","query":"SELECT 1"}`), false},
 		{"List+Builder", mkQuery("signoz/ListPanel", "signoz/BuilderQuery", `{"name":"A","signal":"logs"}`), false},
+		{"TimeSeries+AIBuilder", mkQuery("signoz/TimeSeriesPanel", "signoz/AIBuilderQuery", `{"name":"A","aggregations":[{"expression":"count()"}]}`), false},
+		{"List+AIBuilder", mkQuery("signoz/ListPanel", "signoz/AIBuilderQuery", `{"name":"A"}`), false},
 		// Top-level: rejected
 		{"Table+PromQL", mkQuery("signoz/TablePanel", "signoz/PromQLQuery", `{"name":"A","query":"up"}`), true},
 		{"List+ClickHouse", mkQuery("signoz/ListPanel", "signoz/ClickHouseSQL", `{"name":"A","query":"SELECT 1"}`), true},
@@ -2241,6 +2281,7 @@ func TestPanelTypeQueryTypeCompatibility(t *testing.T) {
 		// Composite sub-queries
 		{"Table+Composite(promql)", mkComposite("signoz/TablePanel", "promql", `{"name":"A","query":"up"}`), true},
 		{"Table+Composite(clickhouse)", mkComposite("signoz/TablePanel", "clickhouse_sql", `{"name":"A","query":"SELECT 1"}`), false},
+		{"Table+Composite(builder_ai)", mkComposite("signoz/TablePanel", "builder_ai_query", `{"name":"A","aggregations":[{"expression":"count()"}]}`), false},
 	}
 
 	for _, tc := range cases {

pkg/types/dashboardtypes/perses_plugin_wrappers.go

@@ -95,6 +95,7 @@ type QueryPlugin struct {
 func (QueryPlugin) PrepareJSONSchema(s *jsonschema.Schema) error {
 	return markDiscriminator(s, "kind", map[string]string{
 		string(QueryKindBuilder):       schemaRef("DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBuilderQuerySpec"),
+		string(QueryKindAIBuilder):     schemaRef("DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpec"),
 		string(QueryKindComposite):     schemaRef("DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5CompositeQuery"),
 		string(QueryKindFormula):       schemaRef("DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5QueryBuilderFormula"),
 		string(QueryKindPromQL):        schemaRef("DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5PromQuery"),
@@ -124,6 +125,7 @@ func (p *QueryPlugin) UnmarshalJSON(data []byte) error {
 func (QueryPlugin) JSONSchemaOneOf() []any {
 	return []any{
 		QueryPluginVariant[BuilderQuerySpec]{Kind: string(QueryKindBuilder)},
+		QueryPluginVariant[AIBuilderQuerySpec]{Kind: string(QueryKindAIBuilder)},
 		QueryPluginVariant[CompositeQuerySpec]{Kind: string(QueryKindComposite)},
 		QueryPluginVariant[FormulaSpec]{Kind: string(QueryKindFormula)},
 		QueryPluginVariant[PromQLQuerySpec]{Kind: string(QueryKindPromQL)},
@@ -144,6 +146,11 @@ func (plugin QueryPlugin) buildV5CompositeQueryFromPlugin() (qb.CompositeQuery,
 			return qb.CompositeQuery{}, errors.Newf(errors.TypeInvalidInput, ErrCodeDashboardInvalidWidgetQuery, "builder query is empty")
 		}
 		return wrapEnvelope(qb.QueryTypeBuilder, spec.Spec), nil
+	case *AIBuilderQuerySpec:
+		if spec == nil {
+			return qb.CompositeQuery{}, errors.Newf(errors.TypeInvalidInput, ErrCodeDashboardInvalidWidgetQuery, "AI builder query is empty")
+		}
+		return wrapEnvelope(qb.QueryTypeBuilderAI, qb.QueryBuilderQuery[qb.TraceAggregation](*spec)), nil
 	case *qb.PromQuery:
 		return wrapEnvelope(qb.QueryTypePromQL, *spec), nil
 	case *qb.ClickHouseQuery:
@@ -240,6 +247,7 @@ var (
 	}
 	queryPluginSpecs = map[QueryPluginKind]func() any{
 		QueryKindBuilder:       func() any { return new(BuilderQuerySpec) },
+		QueryKindAIBuilder:     func() any { return new(AIBuilderQuerySpec) },
 		QueryKindComposite:     func() any { return new(CompositeQuerySpec) },
 		QueryKindFormula:       func() any { return new(FormulaSpec) },
 		QueryKindPromQL:        func() any { return new(PromQLQuerySpec) },
@@ -252,14 +260,14 @@ var (
 		VariableKindCustom:  func() any { return new(CustomVariableSpec) },
 	}
 	allowedQueryKinds = map[PanelPluginKind][]QueryPluginKind{
-		PanelKindTimeSeries: {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindBarChart:   {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindAreaChart:  {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindNumber:     {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindHistogram:  {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindPieChart:   {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
-		PanelKindTable:      {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
-		PanelKindList:       {QueryKindBuilder},
+		PanelKindTimeSeries: {QueryKindBuilder, QueryKindAIBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindBarChart:   {QueryKindBuilder, QueryKindAIBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindAreaChart:  {QueryKindBuilder, QueryKindAIBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindNumber:     {QueryKindBuilder, QueryKindAIBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindHistogram:  {QueryKindBuilder, QueryKindAIBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindPieChart:   {QueryKindBuilder, QueryKindAIBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
+		PanelKindTable:      {QueryKindBuilder, QueryKindAIBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
+		PanelKindList:       {QueryKindBuilder, QueryKindAIBuilder},
 		PanelKindText:       {},
 		PanelKindHeatmap:    {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindPromQL, QueryKindClickHouseSQL},
 	}

pkg/types/dashboardtypes/perses_public_dashboard.go

@@ -106,6 +106,13 @@ func redactQuery(spec any) any {
 			return spec
 		}
 		return &BuilderQuerySpec{Spec: redactLeafQuery(s.Spec)}
+	case *AIBuilderQuerySpec:
+		if s == nil {
+			return spec
+		}
+		redacted := redactLeafQuery(qb.QueryBuilderQuery[qb.TraceAggregation](*s)).(qb.QueryBuilderQuery[qb.TraceAggregation])
+		out := AIBuilderQuerySpec(redacted)
+		return &out
 	case *qb.PromQuery:
 		return redactQueryPtr(s)
 	case *qb.ClickHouseQuery:

pkg/types/dashboardtypes/perses_public_dashboard_panel_query_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/SigNoz/signoz/pkg/errors"
 	qb "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -159,6 +160,11 @@ func TestDashboardV2GetPanelQuery(t *testing.T) {
 			plugin       QueryPlugin
 			expectedType qb.QueryType
 		}{
+			{
+				description:  "AI builder query",
+				plugin:       QueryPlugin{Kind: QueryKindAIBuilder, Spec: &AIBuilderQuerySpec{Name: "A"}},
+				expectedType: qb.QueryTypeBuilderAI,
+			},
 			{
 				description:  "promql",
 				plugin:       QueryPlugin{Kind: QueryKindPromQL, Spec: &qb.PromQuery{Name: "A", Query: "up"}},
@@ -209,6 +215,42 @@ func TestDashboardV2GetPanelQuery(t *testing.T) {
 		}
 	})
 
+	// The gen_ai statement builder only reads traces, so an AI builder query
+	// carries no signal of its own and unwraps to a traces builder query.
+	t.Run("unwraps an AI builder query to a traces builder query", func(t *testing.T) {
+		dashboard := &DashboardV2{
+			Spec: DashboardSpec{
+				Panels: map[string]*Panel{
+					"panel-1": {
+						Spec: PanelSpec{
+							Plugin: PanelPlugin{Kind: PanelKindTimeSeries},
+							Queries: []Query{
+								{
+									Kind: qb.RequestTypeTimeSeries,
+									Spec: QuerySpec{
+										Plugin: QueryPlugin{
+											Kind: QueryKindAIBuilder,
+											Spec: &AIBuilderQuerySpec{Name: "A", Signal: telemetrytypes.SignalTraces},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		}
+
+		req, err := dashboard.GetPanelQuery(1, 2, "panel-1")
+		require.NoError(t, err)
+		require.Len(t, req.CompositeQuery.Queries, 1)
+
+		spec, ok := req.CompositeQuery.Queries[0].Spec.(qb.QueryBuilderQuery[qb.TraceAggregation])
+		require.True(t, ok, "expected traces builder query, got %T", req.CompositeQuery.Queries[0].Spec)
+		assert.Equal(t, "A", spec.Name)
+		assert.Equal(t, telemetrytypes.SignalTraces, spec.Signal)
+	})
+
 	t.Run("sets FormatTableResultForUI only for table panels", func(t *testing.T) {
 		dashboard := &DashboardV2{
 			Spec: DashboardSpec{

pkg/types/dashboardtypes/perses_public_dashboard_redaction_test.go

@@ -133,6 +133,19 @@ func TestRedactQueryPluginWrappers(t *testing.T) {
 		assert.Equal(t, "A", builder.Name)
 	})
 
+	t.Run("AI builder plugin pointer is redacted and stays a pointer", func(t *testing.T) {
+		plugin := &AIBuilderQuerySpec{
+			Name:   "A",
+			Filter: &qb.Filter{Expression: "body contains 'secret'"},
+		}
+
+		result, ok := redactQuery(plugin).(*AIBuilderQuerySpec)
+		require.True(t, ok)
+
+		assert.Nil(t, result.Filter)
+		assert.Equal(t, "A", result.Name)
+	})
+
 	t.Run("composite plugin redacts every sub-query envelope", func(t *testing.T) {
 		composite := &qb.CompositeQuery{Queries: []qb.QueryEnvelope{
 			{Type: qb.QueryTypeBuilder, Spec: qb.QueryBuilderQuery[qb.MetricAggregation]{Name: "A", Filter: &qb.Filter{Expression: "x = 1"}}},

pkg/types/dashboardtypes/perses_signoz_plugins.go

@@ -93,6 +93,7 @@ type QueryPluginKind string
 
 const (
 	QueryKindBuilder       QueryPluginKind = "signoz/BuilderQuery"
+	QueryKindAIBuilder     QueryPluginKind = "signoz/AIBuilderQuery"
 	QueryKindComposite     QueryPluginKind = "signoz/CompositeQuery"
 	QueryKindFormula       QueryPluginKind = "signoz/Formula"
 	QueryKindPromQL        QueryPluginKind = "signoz/PromQLQuery"
@@ -101,7 +102,7 @@ const (
 )
 
 func (QueryPluginKind) Enum() []any {
-	return []any{QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindPromQL, QueryKindClickHouseSQL, QueryKindTraceOperator}
+	return []any{QueryKindBuilder, QueryKindAIBuilder, QueryKindComposite, QueryKindFormula, QueryKindPromQL, QueryKindClickHouseSQL, QueryKindTraceOperator}
 }
 
 type (
@@ -159,6 +160,26 @@ func (BuilderQuerySpec) JSONSchemaOneOf() []any {
 	}
 }
 
+// AIBuilderQuerySpec is the spec of a signoz/AIBuilderQuery plugin: a gen_ai-scoped
+// (AI observability) traces builder query, executed as qb.QueryTypeBuilderAI. The
+// signal is implied by the kind and pinned to traces, mirroring the builder_ai_query
+// QueryEnvelope decode.
+type AIBuilderQuerySpec qb.QueryBuilderQuery[qb.TraceAggregation]
+
+func (b *AIBuilderQuerySpec) UnmarshalJSON(data []byte) error {
+	var spec qb.QueryBuilderQuery[qb.TraceAggregation]
+	if err := json.Unmarshal(data, &spec); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid AI builder query spec")
+	}
+	spec.Signal = telemetrytypes.SignalTraces
+	*b = AIBuilderQuerySpec(spec)
+	return nil
+}
+
+func (AIBuilderQuerySpec) PrepareJSONSchema(s *jsonschema.Schema) error {
+	return (qb.QueryBuilderQuery[qb.TraceAggregation]{}).PrepareJSONSchema(s)
+}
+
 // ══════════════════════════════════════════════
 // SigNoz panel plugin specs
 // ══════════════════════════════════════════════

tests/e2e/.env.example

@@ -13,10 +13,3 @@ SIGNOZ_E2E_BASE_URL=https://app.us.staging.signoz.cloud
 # Test credentials (required only when SIGNOZ_E2E_BASE_URL is set — i.e. staging mode)
 SIGNOZ_E2E_USERNAME=
 SIGNOZ_E2E_PASSWORD=
-
-# Base path mode. `pnpm env:start:base-path` serves SigNoz under /signoz, the
-# way SIGNOZ_GLOBAL_EXTERNAL__URL deploys it, and writes this to .env.local;
-# specs then run unchanged (see helpers/base-path.ts). The root and base path
-# stacks share one database, so stop one and run `pnpm env:clean` before
-# starting the other.
-# SIGNOZ_E2E_BASE_PATH=/signoz

tests/e2e/bootstrap/basepath/conftest.py

@@ -1,55 +0,0 @@
-import pytest
-from testcontainers.core.container import Network
-
-from fixtures import types
-from fixtures.auth import license_applier, register_admin
-from fixtures.signoz import create_signoz
-
-# The e2e stack served under a URL path prefix, as SIGNOZ_GLOBAL_EXTERNAL__URL
-# deploys it. These shadow the root fixtures of the same name; the separate
-# cache keys keep the two stacks from restoring each other's containers.
-BASE_PATH = "/signoz"
-
-
-@pytest.fixture(name="base_path", scope="package")
-def base_path() -> str:
-    return BASE_PATH
-
-
-@pytest.fixture(name="signoz", scope="package")
-def signoz_base_path(  # pylint: disable=too-many-arguments,too-many-positional-arguments
-    network: Network,
-    zeus: types.TestContainerDocker,
-    gateway: types.TestContainerDocker,
-    sqlstore: types.TestContainerSQL,
-    clickhouse: types.TestContainerClickhouse,
-    e2e_env: dict,
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-) -> types.SigNoz:
-    return create_signoz(
-        network=network,
-        zeus=zeus,
-        gateway=gateway,
-        sqlstore=sqlstore,
-        clickhouse=clickhouse,
-        request=request,
-        pytestconfig=pytestconfig,
-        cache_key="signoz_base_path",
-        env_overrides=e2e_env | {"SIGNOZ_GLOBAL_EXTERNAL__URL": f"http://localhost:8080{BASE_PATH}"},
-    )
-
-
-@pytest.fixture(name="create_user_admin", scope="package")
-def create_user_admin_base_path(signoz: types.SigNoz, request: pytest.FixtureRequest, pytestconfig: pytest.Config) -> types.Operation:
-    return register_admin(signoz, request, pytestconfig, cache_key="create_user_admin_base_path", base_path=BASE_PATH)
-
-
-@pytest.fixture(name="apply_license", scope="package")
-def apply_license_base_path(
-    signoz: types.SigNoz,
-    create_user_admin: types.Operation,  # pylint: disable=unused-argument
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-) -> types.Operation:
-    return license_applier(signoz, request, pytestconfig, cache_key="apply_license_base_path", base_path=BASE_PATH)

tests/e2e/bootstrap/basepath/setup.py

@@ -1,5 +0,0 @@
-# The root bootstrap's tests, collected again here so they resolve the
-# base-path fixtures from this package's conftest.py.
-from e2e.bootstrap.setup import test_setup, test_teardown
-
-__all__ = ["test_setup", "test_teardown"]

tests/e2e/bootstrap/conftest.py

@@ -1,45 +0,0 @@
-import pytest
-from testcontainers.core.container import Network
-
-from fixtures import types
-from fixtures.signoz import create_signoz
-
-
-@pytest.fixture(name="base_path", scope="package")
-def base_path() -> str:
-    """URL path prefix SigNoz is served under. Empty serves it at the root;
-    basepath/conftest.py overrides it."""
-    return ""
-
-
-@pytest.fixture(name="e2e_env", scope="package")
-def e2e_env() -> dict:
-    """Environment every e2e SigNoz gets. Each Playwright worker logs in once,
-    and the default cap of 5 sessions per user evicts the oldest, which turns a
-    worker's requests into 401s mid-run."""
-    return {"SIGNOZ_TOKENIZER_OPAQUE_TOKEN_MAX__PER__USER": 100}
-
-
-@pytest.fixture(name="signoz", scope="package")
-def signoz(  # pylint: disable=too-many-arguments,too-many-positional-arguments
-    network: Network,
-    zeus: types.TestContainerDocker,
-    gateway: types.TestContainerDocker,
-    sqlstore: types.TestContainerSQL,
-    clickhouse: types.TestContainerClickhouse,
-    tls: types.TLS,
-    e2e_env: dict,
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-) -> types.SigNoz:
-    return create_signoz(
-        network=network,
-        zeus=zeus,
-        gateway=gateway,
-        sqlstore=sqlstore,
-        clickhouse=clickhouse,
-        request=request,
-        pytestconfig=pytestconfig,
-        tls=tls,
-        env_overrides=e2e_env,
-    )

tests/e2e/bootstrap/setup.py

@@ -15,12 +15,11 @@ def _env_file(pytestconfig: pytest.Config) -> Path:
     return pytestconfig.rootpath / "e2e" / ".env.local"
 
 
-def test_setup(  # pylint: disable=too-many-arguments,too-many-positional-arguments
+def test_setup(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     apply_license: types.Operation,  # pylint: disable=unused-argument
     seeder: types.TestContainerDocker,
-    base_path: str,
     pytestconfig: pytest.Config,
 ) -> None:
     """Bring the backend up and write e2e coordinates to .env.local."""
@@ -34,8 +33,6 @@ def test_setup(  # pylint: disable=too-many-arguments,too-many-positional-argume
         f.write(f"SIGNOZ_E2E_USERNAME={USER_ADMIN_EMAIL}\n")
         f.write(f"SIGNOZ_E2E_PASSWORD={USER_ADMIN_PASSWORD}\n")
         f.write(f"SIGNOZ_E2E_SEEDER_URL={seeder_cfg.base()}\n")
-        if base_path:
-            f.write(f"SIGNOZ_E2E_BASE_PATH={base_path}\n")
 
 
 def test_teardown(

tests/e2e/drivers/kit.ts

@@ -1,93 +0,0 @@
-/**
- * AI-owned. Generated and maintained by coding agents alongside the specs that
- * use it. Do not hand-edit: regenerate it with the spec that needs the change.
- */
-import type { Browser, Page, TestType } from '@playwright/test';
-
-import { newAdminContext } from '../helpers/auth';
-
-export { expect, test as kit } from '../fixtures/auth';
-
-export interface DriverContext {
-	page: Page;
-}
-
-type Fixtures = Record<string, unknown>;
-
-/**
- * Adds test-scoped fixtures to any test carrying `authedPage`. `T` is inferred
- * from the argument: TypeScript cannot invert `T & { authedPage: Page }`, so
- * constraining that way widens every existing fixture to `unknown`.
- */
-export type Layer<Adds> = <T extends { authedPage: Page }, W extends object>(
-	base: TestType<T, W>,
-) => TestType<T & Adds, W>;
-
-export type WorkerLayer<Adds> = <T extends object, W extends object>(
-	base: TestType<T, W>,
-) => TestType<T, W & Adds>;
-
-/** A `withX` layer binding `build` to the authenticated page. */
-export function driver<Name extends string, T>(
-	name: Name,
-	build: (ctx: DriverContext) => T,
-): Layer<{ [K in Name]: T }> {
-	const fixture = {
-		// Playwright reads fixture dependencies from the source text, so
-		// `authedPage` must stay destructured literally.
-		[name]: async (
-			{ authedPage }: { authedPage: Page },
-			use: (value: T) => Promise<void>,
-		) => {
-			await use(build({ page: authedPage }));
-		},
-	};
-	return ((test: TestType<Fixtures, Fixtures>) =>
-		test.extend(fixture as never)) as Layer<{ [K in Name]: T }>;
-}
-
-/**
- * A `withX` layer that seeds once per worker and tears down after. `open` and
- * `close` run on a throwaway admin page: worker fixtures cannot reach
- * `authedPage`.
- */
-export function seeded<Name extends string, T>(
-	name: Name,
-	open: (ctx: { page: Page; workerIndex: number }) => Promise<T>,
-	close?: (ctx: { page: Page; value: T }) => Promise<void>,
-	options: { timeout?: number } = {},
-): WorkerLayer<{ [K in Name]: T }> {
-	const fixture = {
-		[name]: [
-			async (
-				{ browser }: { browser: Browser },
-				use: (value: T) => Promise<void>,
-				workerInfo: { workerIndex: number },
-			) => {
-				const value = await onAdminPage(browser, (page) =>
-					open({ page, workerIndex: workerInfo.workerIndex }),
-				);
-				await use(value);
-				if (close) {
-					await onAdminPage(browser, (page) => close({ page, value }));
-				}
-			},
-			{ scope: 'worker', timeout: options.timeout },
-		],
-	};
-	return ((test: TestType<Fixtures, Fixtures>) =>
-		test.extend(fixture as never)) as WorkerLayer<{ [K in Name]: T }>;
-}
-
-/** Run `body` on a throwaway page authenticated as the admin. */
-export async function onAdminPage<T>(
-	browser: Browser,
-	body: (page: Page) => Promise<T>,
-): Promise<T> {
-	const ctx = await newAdminContext(browser);
-	try {
-		return await body(await ctx.newPage());
-	} finally {
-		await ctx.close();
-	}
-}

tests/e2e/drivers/routing.ts

@@ -1,392 +0,0 @@
-/**
- * AI-owned. Generated and maintained by coding agents alongside the specs that
- * use it. Do not hand-edit: regenerate it with the spec that needs the change.
- */
-import { randomBytes } from 'crypto';
-
-import { expect, type Locator, type Page } from '@playwright/test';
-
-import { ADMIN } from '../helpers/auth';
-import { authToken } from '../helpers/common';
-import {
-	createDashboardViaApi,
-	deleteDashboardViaApi,
-} from '../helpers/dashboards';
-import { seedPodMetricsViaSeeder } from '../helpers/infra-monitoring';
-import { gotoLogsExplorer } from '../helpers/logs-explorer';
-import {
-	gotoTraceUntilLoaded,
-	type LargeTrace,
-	loadLargeTrace,
-	seedTracesViaSeeder,
-} from '../helpers/trace-details';
-
-import { driver, kit, seeded } from './kit';
-
-// The react-router v5 -> v7 regression net. Router-sensitive mechanics (history
-// depth, POP, same-url suppression, the `newTab` branch) live here so the specs
-// read as the property they guard.
-
-export const PATH = {
-	alerts: '/alerts',
-	dashboards: '/dashboard',
-	home: '/home',
-	k8s: '/infrastructure-monitoring/kubernetes',
-	login: '/login',
-	metricsSummary: '/metrics-explorer/summary',
-	metricsViews: '/metrics-explorer/views',
-	roles: '/settings/roles',
-	roleCreate: '/settings/roles/new',
-	services: '/services',
-	tracesExplorer: '/traces-explorer',
-	/** Matches no entry of `AppRoutes/routes.ts`. */
-	unknown: '/definitely-not-a-route',
-} as const;
-
-/** A resource attribute every seeded pod carries. */
-const NAMESPACE_ATTR = 'k8s.namespace.name';
-
-const RELATIVE_TIME_LABELS: Record<string, string> = {
-	'30m': 'Last 30 minutes',
-	'1h': 'Last 1 hour',
-	'6h': 'Last 6 hours',
-};
-
-/** Three browser projects share one backend, so names need more than a timestamp. */
-function uniqueSuffix(): string {
-	return randomBytes(4).toString('hex');
-}
-
-/** Role names allow lowercase letters and hyphens only. */
-export function uniqueAlphaSuffix(): string {
-	return [...randomBytes(6)]
-		.map((byte) => String.fromCharCode(97 + (byte % 26)))
-		.join('');
-}
-
-export function dashboardListParams(title: string): Record<string, string> {
-	return { search: title, columnKey: 'updatedAt', order: 'descend', page: '1' };
-}
-
-function groupByOf(url: URL): string {
-	return url.searchParams.get('groupBy') ?? '';
-}
-
-export interface Routing {
-	goto(path: string): Promise<void>;
-	reload(): Promise<void>;
-	goBack(): Promise<void>;
-	goForward(): Promise<void>;
-	/** Go back one entry and wait for `pathname`. */
-	goBackTo(pathname: string): Promise<void>;
-	url(): URL;
-	params(): Record<string, string>;
-	waitForPath(pathname: string): Promise<void>;
-	waitForParam(key: string, value: string): Promise<void>;
-	/** `history.length`: Chromium keeps it on POP and REPLACE, grows it on PUSH. */
-	historyDepth(): Promise<number>;
-	/** Complete the login form on the page as it stands, without navigating. */
-	login(): Promise<void>;
-	/** Sidebar entries are `div.nav-item`, not links. */
-	sidebarItem(label: string): Locator;
-	/** antd puts a `RouteTab` item's route on `data-node-key`. */
-	routeTab(route: string): Locator;
-	activeRouteTab(route: string): Locator;
-	/** The picker `TopNav` renders. Several pages mount their own. */
-	globalTimePicker(): Locator;
-	selectRelativeTime(value: string): Promise<void>;
-	expectRelativeTime(value: string): Promise<void>;
-	/** Ctrl/Cmd-click `target`, run `body` on the tab it opens, then close it. */
-	inNewTab(
-		target: Locator,
-		body: (tab: Routing) => Promise<void>,
-	): Promise<void>;
-	/** Hold every script requested during `body`, so lazy route chunks suspend. */
-	whileScriptsHeld(body: () => Promise<void>): Promise<void>;
-	gotoLogsExplorer(): Promise<void>;
-	dashboards: {
-		gotoList(title?: string): Promise<void>;
-		/** Not `dashboard-title-0`: the search tokenises on hyphens and matches leftovers. */
-		row(title: string): Locator;
-		landmark(): Locator;
-		title(): Locator;
-	};
-	k8s: {
-		/** Open the pods list once its mount-time `compositeQuery` rewrite landed. */
-		goto(params: Record<string, string>): Promise<void>;
-		/** One nuqs push: `groupBy`, `page` and `orderBy` flush together. */
-		groupBy(attribute: string): Promise<void>;
-		waitUntilGrouped(attribute: string, grouped?: boolean): Promise<void>;
-		groupBySelect(): Locator;
-	};
-	trace: {
-		path(trace: LargeTrace): string;
-		goto(trace: LargeTrace): Promise<void>;
-		rootRow(trace: LargeTrace): Locator;
-		back(): Promise<void>;
-	};
-	roles: {
-		/** Fill the create form far enough to arm the navigation blocker. */
-		openCreateForm(name: string): Promise<void>;
-		nameInput(): Locator;
-		cancel(): Promise<void>;
-		save(): Promise<void>;
-		discardDialog(): Locator;
-		settings(): Locator;
-		removeByName(names: string[]): Promise<void>;
-	};
-}
-
-export function routingDriver(page: Page): Routing {
-	const timePicker = (): Locator => page.getByTestId('dropDown');
-
-	const routing: Routing = {
-		goto: async (path) => {
-			await page.goto(path);
-		},
-		reload: async () => {
-			await page.reload();
-		},
-		goBack: async () => {
-			await page.goBack();
-		},
-		goForward: async () => {
-			await page.goForward();
-		},
-		goBackTo: async (pathname) => {
-			await page.goBack();
-			await routing.waitForPath(pathname);
-		},
-
-		url: () => new URL(page.url()),
-		params: () => Object.fromEntries(routing.url().searchParams),
-		waitForPath: (pathname) =>
-			page.waitForURL((url) => url.pathname === pathname),
-		waitForParam: (key, value) =>
-			page.waitForURL((url) => url.searchParams.get(key) === value),
-		historyDepth: () =>
-			page.evaluate(
-				() =>
-					(globalThis as unknown as { history: { length: number } }).history.length,
-			),
-
-		login: async () => {
-			await page.getByTestId('email').fill(ADMIN.email);
-			await page.getByTestId('initiate_login').click();
-			await page.getByTestId('password').fill(ADMIN.password);
-			await page.getByTestId('password_authn_submit').click();
-		},
-
-		sidebarItem: (label) =>
-			page.locator('.nav-item').filter({ hasText: new RegExp(`^${label}$`) }),
-		routeTab: (route) => page.locator(`.ant-tabs-tab[data-node-key="${route}"]`),
-		activeRouteTab: (route) =>
-			routing.routeTab(route).getByRole('tab', { selected: true }),
-
-		globalTimePicker: () =>
-			page.locator('.top-nav-container').getByTestId('dropDown'),
-
-		// A click before the picker is interactive is dropped silently, so retry the
-		// open. The popover unmounts on close, which is what proves the selection
-		// committed: the url may legitimately stay the same.
-		selectRelativeTime: async (value) => {
-			const option = page.getByTestId(`time-option-${value}`);
-			await expect(async () => {
-				if (!(await option.isVisible())) {
-					await timePicker().click();
-				}
-				await expect(option).toBeVisible({ timeout: 3_000 });
-			}).toPass({ timeout: 30_000 });
-			await option.click();
-			await expect(option).toBeHidden();
-		},
-
-		expectRelativeTime: async (value) => {
-			await expect(timePicker()).toHaveAccessibleName(RELATIVE_TIME_LABELS[value]);
-		},
-
-		inNewTab: async (target, body) => {
-			const [tab] = await Promise.all([
-				page.context().waitForEvent('page'),
-				target.click({ modifiers: ['ControlOrMeta'] }),
-			]);
-			try {
-				await tab.waitForLoadState();
-				await body(routingDriver(tab));
-			} finally {
-				await tab.close();
-			}
-		},
-
-		// The handler stays installed after the release: `unroute` drops the
-		// requests still parked in it.
-		whileScriptsHeld: async (body) => {
-			let release = (): void => {};
-			const held = new Promise<void>((resolve) => {
-				release = resolve;
-			});
-			await page.route('**/*.js', async (route) => {
-				await held;
-				await route.continue();
-			});
-			try {
-				await body();
-			} finally {
-				release();
-			}
-		},
-
-		gotoLogsExplorer: () => gotoLogsExplorer(page),
-
-		dashboards: {
-			gotoList: async (title) => {
-				if (!title) {
-					await page.goto(PATH.dashboards);
-					await expect(routing.dashboards.landmark()).toBeVisible();
-					return;
-				}
-				const search = new URLSearchParams(dashboardListParams(title));
-				await page.goto(`${PATH.dashboards}?${search.toString()}`);
-				await expect(routing.dashboards.row(title)).toBeVisible();
-			},
-			row: (title) =>
-				page
-					.locator('[data-testid^="dashboard-title-"]')
-					.filter({ hasText: title }),
-			// The views rail renders whether or not the list is empty.
-			landmark: () => page.getByTestId('dashboards-view-search'),
-			title: () => page.getByTestId('dashboard-title'),
-		},
-
-		k8s: {
-			goto: async (params) => {
-				const search = new URLSearchParams({ category: 'pods', ...params });
-				await page.goto(`${PATH.k8s}?${search.toString()}`);
-				await page.waitForURL((url) => url.searchParams.has('compositeQuery'));
-				await expect(routing.k8s.groupBySelect()).toBeVisible();
-			},
-			// The search input stays readonly until the dropdown opens, and `hasText`
-			// would also match longer keys, so type after opening and match the title.
-			groupBy: async (attribute) => {
-				await routing.k8s.groupBySelect().click();
-				await page.keyboard.type(attribute);
-				await page.locator(`.ant-select-item-option[title="${attribute}"]`).click();
-				await page.keyboard.press('Escape');
-				await routing.k8s.waitUntilGrouped(attribute);
-			},
-			waitUntilGrouped: (attribute, grouped = true) =>
-				page.waitForURL((url) => groupByOf(url).includes(attribute) === grouped),
-			groupBySelect: () => page.getByTestId('k8s-table-group-by-select'),
-		},
-
-		trace: {
-			path: (trace) => `/trace/${trace.traceId}`,
-			goto: (trace) =>
-				gotoTraceUntilLoaded(
-					page,
-					routing.trace.path(trace),
-					`cell-0-${trace.landmarks.root}`,
-				),
-			rootRow: (trace) => page.getByTestId(`cell-0-${trace.landmarks.root}`),
-			back: async () => {
-				await page.getByRole('button', { name: 'Back' }).click();
-			},
-		},
-
-		roles: {
-			openCreateForm: async (name) => {
-				await page.goto(PATH.roleCreate);
-				await routing.roles.nameInput().fill(name);
-				await expect(page.getByText('Unsaved changes')).toBeVisible();
-			},
-			nameInput: () => page.getByTestId('role-name-input'),
-			cancel: async () => {
-				await page.getByTestId('cancel-button').click();
-			},
-			save: async () => {
-				await page.getByTestId('save-button').click();
-			},
-			discardDialog: () => page.getByTestId('discard-changes-dialog'),
-			settings: () => page.getByTestId('roles-settings'),
-			removeByName: async (names) => {
-				const headers = { Authorization: `Bearer ${await authToken(page)}` };
-				const res = await page.request.get('/api/v1/roles', { headers });
-				const { data } = (await res.json()) as {
-					data: { id: string; name: string }[];
-				};
-				await Promise.all(
-					data
-						.filter((role) => names.includes(role.name))
-						.map((role) =>
-							page.request.delete(`/api/v1/roles/${role.id}`, { headers }),
-						),
-				);
-			},
-		},
-	};
-
-	return routing;
-}
-
-// The seeder serves inserts on one ClickHouse session, so parallel workers
-// collide with a transient `500 concurrent queries within the same session`.
-const SEED_RETRY_MS = 120_000;
-const SEED_TIMEOUT_MS = 180_000;
-
-async function seedWithRetry(seed: () => Promise<void>): Promise<void> {
-	await expect(seed).toPass({
-		timeout: SEED_RETRY_MS,
-		intervals: [1_000, 2_000, 5_000],
-	});
-}
-
-const withRouting = driver('routing', ({ page }) => routingDriver(page));
-
-const withDashboard = seeded(
-	'dashboard',
-	async ({ page }) => {
-		const title = `routing-${uniqueSuffix()}`;
-		const id = await createDashboardViaApi(page, title);
-		return { id, title, path: `${PATH.dashboards}/${id}` };
-	},
-	async ({ page, value }) =>
-		deleteDashboardViaApi(page.request, value.id, await authToken(page)),
-);
-
-const withTrace = seeded(
-	'largeTrace',
-	async ({ page }) => {
-		const trace = loadLargeTrace();
-		await seedWithRetry(() => seedTracesViaSeeder(page.request, trace.spans));
-		return trace;
-	},
-	undefined,
-	{ timeout: SEED_TIMEOUT_MS },
-);
-
-// Group-by options come from `/fields/keys` over the queried window, so the
-// select stays empty until pod metrics exist inside it.
-const withPods = seeded(
-	'pods',
-	async ({ page }) => {
-		await seedWithRetry(() => seedPodMetricsViaSeeder(page));
-		return { groupBy: NAMESPACE_ATTR };
-	},
-	undefined,
-	{ timeout: SEED_TIMEOUT_MS },
-);
-
-export const test = withPods(
-	withTrace(withDashboard(withRouting(kit))),
-).extend<{
-	/** The routing driver on an unauthenticated page. */
-	guest: Routing;
-}>({
-	guest: async ({ browser }, use) => {
-		const ctx = await browser.newContext();
-		await use(routingDriver(await ctx.newPage()));
-		await ctx.close();
-	},
-});
-
-export { expect, onAdminPage } from './kit';

tests/e2e/fixtures/auth.ts

@@ -1,42 +1,27 @@
 import { test as base, expect, type Page } from '@playwright/test';
 
 import { ADMIN, storageStateFor, type User } from '../helpers/auth';
-import { installBasePathMode } from '../helpers/base-path';
 
 // The login flow and the per-worker session cache live in `helpers/auth.ts` so
 // worker-scoped fixtures and suite hooks share one login with this fixture.
 export { ADMIN };
 export type { User };
 
-export const test = base.extend<
-	{
-		/**
-		 * User identity for this test. Override with `test.use({ user: ... })` at
-		 * the describe or test level to run the suite as a different user.
-		 * Defaults to ADMIN (the pytest-bootstrap-seeded admin).
-		 */
-		user: User;
-
-		/**
-		 * A Page whose context is already authenticated as `user`. First request
-		 * for a given user triggers one login per worker; the resulting
-		 * storageState is held in memory and reused for all later requests.
-		 */
-		authedPage: Page;
-	},
-	{
-		/** Applies SIGNOZ_E2E_BASE_PATH before any page or login in the worker. */
-		basePathMode: void;
-	}
->({
-	basePathMode: [
-		async ({ browser }, use) => {
-			await installBasePathMode(browser);
-			await use();
-		},
-		{ scope: 'worker', auto: true },
-	],
+export const test = base.extend<{
+	/**
+	 * User identity for this test. Override with `test.use({ user: ... })` at
+	 * the describe or test level to run the suite as a different user.
+	 * Defaults to ADMIN (the pytest-bootstrap-seeded admin).
+	 */
+	user: User;
 
+	/**
+	 * A Page whose context is already authenticated as `user`. First request
+	 * for a given user triggers one login per worker; the resulting
+	 * storageState is held in memory and reused for all later requests.
+	 */
+	authedPage: Page;
+}>({
 	user: [ADMIN, { option: true }],
 
 	authedPage: async ({ browser, user }, use) => {

tests/e2e/helpers/alerts/navigation.ts

@@ -72,7 +72,6 @@ export async function gotoAlertList(
 	await page.goto(`${ALERTS_LIST_PATH}?${query.toString()}`);
 	await expect(page.getByTestId('list-alerts-search-input')).toBeVisible();
 	if (expectRows) {
-		// Skeleton rows are empty and ignore clicks; wait for a loaded one.
-		await expect(alertRuleRows(page).first()).toHaveText(/\S/);
+		await expect(alertRuleRows(page).first()).toBeVisible();
 	}
 }

tests/e2e/helpers/auth.ts

@@ -1,7 +1,5 @@
 import type { Browser, BrowserContext, Page } from '@playwright/test';
 
-import { storageKey } from './base-path';
-
 export type User = { email: string; password: string };
 
 /** Default user — admin from the pytest bootstrap (.env.local) or staging .env. */
@@ -59,8 +57,7 @@ async function login(page: Page, user: User): Promise<void> {
 async function pinSidenav(page: Page): Promise<void> {
 	const token = await page.evaluate(
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		(key) => (globalThis as any).localStorage.getItem(key) || '',
-		storageKey('AUTH_TOKEN'),
+		() => (globalThis as any).localStorage.getItem('AUTH_TOKEN') || '',
 	);
 	const res = await page.request.put('/api/v1/user/preferences/sidenav_pinned', {
 		data: { value: true },

tests/e2e/helpers/base-path.ts

@@ -1,105 +0,0 @@
-import type { APIRequestContext, Browser, Page } from '@playwright/test';
-
-// Base path mode: with SIGNOZ_E2E_BASE_PATH set (`pnpm env:start:base-path`
-// writes `/signoz`), specs run unchanged against SigNoz served under that URL
-// prefix. `page.goto`, `page.waitForURL` string targets and `request.*` take
-// app paths and get the prefix; `page.url()` and `waitForURL` predicates see
-// the URL without it. `expect(page).toHaveURL` still sees the real URL.
-
-export const BASE_PATH = (process.env.SIGNOZ_E2E_BASE_PATH ?? '').replace(
-	/\/$/,
-	'',
-);
-
-/** The app scopes its localStorage keys to the base path (`utils/storage.ts`). */
-export function storageKey(key: string): string {
-	return BASE_PATH ? `${BASE_PATH}/${key}` : key;
-}
-
-function toServedPath(path: string): string {
-	return path.startsWith('/') && !path.startsWith('//')
-		? `${BASE_PATH}${path}`
-		: path;
-}
-
-function toAppUrl(href: string): string {
-	const url = new URL(href);
-	if (url.pathname === BASE_PATH || url.pathname.startsWith(`${BASE_PATH}/`)) {
-		url.pathname = url.pathname.slice(BASE_PATH.length) || '/';
-	}
-	return url.toString();
-}
-
-function patchMethod<T extends object, K extends keyof T>(
-	proto: T,
-	name: K,
-	wrap: (original: T[K]) => T[K],
-): void {
-	proto[name] = wrap(proto[name]);
-}
-
-let installed = false;
-
-/**
- * Patches the Page and APIRequestContext prototypes once per worker. Playwright
- * exports neither class, so the prototypes come from a throwaway page.
- */
-export async function installBasePathMode(browser: Browser): Promise<void> {
-	if (!BASE_PATH || installed) {
-		return;
-	}
-	installed = true;
-
-	const context = await browser.newContext();
-	const page = await context.newPage();
-	const pageProto: Page = Object.getPrototypeOf(page);
-	const requestProto: APIRequestContext = Object.getPrototypeOf(page.request);
-	await context.close();
-
-	patchMethod(
-		pageProto,
-		'goto',
-		(goto) =>
-			function (this: Page, target, options) {
-				return goto.call(this, toServedPath(target), options);
-			},
-	);
-
-	patchMethod(
-		pageProto,
-		'url',
-		(url) =>
-			function (this: Page) {
-				return toAppUrl(url.call(this));
-			},
-	);
-
-	patchMethod(
-		pageProto,
-		'waitForURL',
-		(waitForURL) =>
-			function (this: Page, matcher, options) {
-				let appMatcher = matcher;
-				if (typeof matcher === 'function') {
-					appMatcher = (current: URL): boolean =>
-						matcher(new URL(toAppUrl(current.href)));
-				} else if (typeof matcher === 'string') {
-					appMatcher = toServedPath(matcher);
-				}
-				return waitForURL.call(this, appMatcher, options);
-			},
-	);
-
-	patchMethod(
-		requestProto,
-		'fetch',
-		(fetch) =>
-			function (this: APIRequestContext, target, options) {
-				return fetch.call(
-					this,
-					typeof target === 'string' ? toServedPath(target) : target,
-					options,
-				);
-			},
-	);
-}

tests/e2e/helpers/common.ts

@@ -1,7 +1,5 @@
 import type { Page, Request } from '@playwright/test';
 
-import { storageKey } from './base-path';
-
 // Shared helpers used across feature-specific helper modules (dashboards,
 // trace-details, …). Keep this to genuinely cross-feature utilities.
 
@@ -47,8 +45,6 @@ const HARNESS_CONSOLE_NOISE = [
 	'Request failed with status code 404',
 	'client never received a response, or request never left',
 	'ErrorResponseHandler: unclassified error',
-	// Google Fonts, which the chromium project fails at DNS (playwright.config.ts).
-	'Failed to load resource: net::ERR_NAME_NOT_RESOLVED',
 ];
 
 export interface ConsoleWatch {
@@ -134,9 +130,7 @@ export function requestUrl(request: Request): URL {
 export async function authToken(page: Page): Promise<string> {
 	const state = await page.context().storageState();
 	for (const origin of state.origins) {
-		const entry = origin.localStorage.find(
-			(e) => e.name === storageKey('AUTH_TOKEN'),
-		);
+		const entry = origin.localStorage.find((e) => e.name === 'AUTH_TOKEN');
 		if (entry) {
 			return entry.value;
 		}

tests/e2e/helpers/dashboards.ts

@@ -11,8 +11,6 @@ import apmMetricsTemplate from '../testdata/apm-metrics.json';
 import chartDataTemplate from '../testdata/chart-data-dashboard.json';
 import variablesTemplate from '../testdata/variables-dashboard.json';
 
-import { storageKey } from './base-path';
-
 // ─── Constants ───────────────────────────────────────────────────────────
 //
 // UI strings and well-known values referenced both within this file and by
@@ -47,8 +45,7 @@ export async function authToken(page: Page): Promise<string> {
 	}
 	return page.evaluate(
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		(key) => (globalThis as any).localStorage.getItem(key) || '',
-		storageKey('AUTH_TOKEN'),
+		() => (globalThis as any).localStorage.getItem('AUTH_TOKEN') || '',
 	);
 }
 
@@ -85,39 +82,12 @@ async function postDashboard(
 	return json.data.id;
 }
 
-/**
- * Seed a minimally-named dashboard via API. Returns the new ID.
- *
- * v2 (Perses spec) only: `POST /api/v1/dashboards` now answers 501
- * `dashboard_deprecated`. Payload mirrors what the New-dashboard modal sends
- * (`BlankDashboardPanel.tsx`), `schemaVersion` included.
- */
+/** Seed a minimally-named dashboard via API. Returns the new ID. */
 export async function createDashboardViaApi(
 	page: Page,
 	title: string,
 ): Promise<string> {
-	const token = await authToken(page);
-	const res = await page.request.post('/api/v2/dashboards', {
-		data: {
-			schemaVersion: 'v6',
-			generateName: true,
-			tags: null,
-			spec: {
-				display: { name: title },
-				layouts: [],
-				panels: {},
-				variables: [],
-			},
-		},
-		headers: { Authorization: `Bearer ${token}` },
-	});
-	if (!res.ok()) {
-		throw new Error(
-			`POST /api/v2/dashboards ${res.status()}: ${await res.text()}`,
-		);
-	}
-	const json = (await res.json()) as { data: { id: string } };
-	return json.data.id;
+	return postDashboard(page, { title, uploadedGrafana: false });
 }
 
 /**
@@ -372,7 +342,7 @@ export async function deleteDashboardViaApi(
 	token: string,
 ): Promise<void> {
 	await request
-		.delete(`/api/v2/dashboards/${id}`, {
+		.delete(`/api/v1/dashboards/${id}`, {
 			headers: { Authorization: `Bearer ${token}` },
 		})
 		.catch(() => undefined);

tests/e2e/helpers/infra-monitoring.ts

@@ -1,110 +0,0 @@
-import type { Page } from '@playwright/test';
-
-import { seederUrl } from './common';
-
-// Seeding for the Kubernetes lists under /infrastructure-monitoring.
-
-/**
- * The metric the pods list queries. Its rows are what put the pod resource
- * attributes into `/fields/keys`, which is where the group-by select gets its
- * options, so this is the metric to seed, not an arbitrary one.
- *
- * Dotted, not `k8s_pod_cpu_usage`: the list passes this name straight through as
- * `metricNamespace` and the backend matches it literally, so the underscored
- * spelling returns an empty key set and the group-by select renders "No data".
- */
-const POD_CPU_METRIC = 'k8s.pod.cpu.usage';
-const POD_MEMORY_METRIC = 'k8s.pod.memory.usage';
-
-const NAMESPACES = ['default', 'kube-system', 'signoz'];
-const PODS_PER_NAMESPACE = 2;
-const POINTS_PER_POD = 4;
-const POINT_INTERVAL_MS = 60_000;
-
-type SeededMetric = {
-	metric_name: string;
-	timestamp: string;
-	value: number;
-	type_: string;
-	temporality: string;
-	is_monotonic: boolean;
-	unit: string;
-	resource_attrs: Record<string, string>;
-	labels: Record<string, string>;
-};
-
-function podResourceAttrs(
-	namespace: string,
-	pod: string,
-): Record<string, string> {
-	return {
-		'k8s.cluster.name': 'e2e-cluster',
-		'k8s.namespace.name': namespace,
-		'k8s.node.name': `node-${namespace}`,
-		'k8s.pod.name': pod,
-		'k8s.pod.uid': `${namespace}-${pod}`,
-	};
-}
-
-function podPoints(now: number): SeededMetric[] {
-	const points: SeededMetric[] = [];
-	for (const namespace of NAMESPACES) {
-		for (let p = 0; p < PODS_PER_NAMESPACE; p += 1) {
-			const pod = `${namespace}-pod-${p}`;
-			const resourceAttrs = podResourceAttrs(namespace, pod);
-			for (let i = 0; i < POINTS_PER_POD; i += 1) {
-				const timestamp = new Date(
-					now - (POINTS_PER_POD - i) * POINT_INTERVAL_MS,
-				).toISOString();
-				points.push({
-					metric_name: POD_CPU_METRIC,
-					timestamp,
-					value: 0.1 + i * 0.05,
-					type_: 'Gauge',
-					temporality: 'Unspecified',
-					is_monotonic: false,
-					unit: '1',
-					resource_attrs: resourceAttrs,
-					labels: resourceAttrs,
-				});
-				points.push({
-					metric_name: POD_MEMORY_METRIC,
-					timestamp,
-					value: 100_000_000 + i * 1_000_000,
-					type_: 'Gauge',
-					temporality: 'Unspecified',
-					is_monotonic: false,
-					unit: 'By',
-					resource_attrs: resourceAttrs,
-					labels: resourceAttrs,
-				});
-			}
-		}
-	}
-	return points;
-}
-
-/**
- * Seed pod metrics so the k8s list has rows and its group-by select has
- * options. Both matter: with no rows inside the queried window the select
- * renders empty and every `setK8sGroupBy` call times out.
- *
- * The pod keys go in `labels` as well as `resource_attrs`: the list's queries
- * reference some of them as `tag` and others as `resource`, and the series
- * fingerprint is computed off labels alone. With an empty label map all six
- * pods collapse into one series and the list comes back empty.
- *
- * Wrap the call in `seedWithRetry`: the seeder serves inserts on one
- * ClickHouse session, so parallel workers collide with a transient 500.
- */
-export async function seedPodMetricsViaSeeder(page: Page): Promise<void> {
-	const res = await page.request.post(`${seederUrl()}/telemetry/metrics`, {
-		data: podPoints(Date.now()),
-		headers: { 'Content-Type': 'application/json' },
-	});
-	if (!res.ok()) {
-		throw new Error(
-			`seeder POST /telemetry/metrics ${res.status()}: ${await res.text()}`,
-		);
-	}
-}

tests/e2e/package.json

@@ -7,8 +7,6 @@
     "preinstall": "npx only-allow pnpm",
     "env:start": "cd .. && uv run pytest --basetemp=./tmp/ -vv --reuse --rebuild --capture=no --with-web e2e/bootstrap/setup.py::test_setup",
     "env:stop": "cd .. && uv run pytest --basetemp=./tmp/ -vv --teardown --capture=no e2e/bootstrap/setup.py::test_teardown",
-    "env:start:base-path": "cd .. && uv run pytest --basetemp=./tmp/ -vv --reuse --rebuild --capture=no --with-web e2e/bootstrap/basepath/setup.py::test_setup",
-    "env:stop:base-path": "cd .. && uv run pytest --basetemp=./tmp/ -vv --teardown --capture=no e2e/bootstrap/basepath/setup.py::test_teardown",
     "env:clean": "rm -rf ../tmp ../.pytest_cache .env.local artifacts && echo 'Cleaned. Run docker container prune if needed.'",
     "test": "playwright test",
     "test:local": "pnpm env:start && pnpm test",

tests/e2e/playwright.config.ts

@@ -108,15 +108,7 @@ export default defineConfig({
 		},
 		{
 			name: 'chromium',
-			use: {
-				...devices['Desktop Chrome'],
-				launchOptions: {
-					// Google Fonts CSS blocks the app script and `load` until it settles,
-					// so a stalled request blanks the page. Failing DNS settles it at once;
-					// a `route` would too, but routing turns off the HTTP cache.
-					args: ['--host-resolver-rules=MAP fonts.googleapis.com ~NOTFOUND'],
-				},
-			},
+			use: devices['Desktop Chrome'],
 			dependencies: ['setup'],
 		},
 		{

tests/e2e/tests/alerts/create/v2.spec.ts

@@ -26,7 +26,6 @@ import {
 	v2SaveTooltip,
 	v2TestButton,
 } from '../../../helpers/alert-forms/v2';
-import { BASE_PATH } from '../../../helpers/base-path';
 
 // CV2-* — the v2 create builder.
 //
@@ -447,7 +446,7 @@ test.describe('Alert create — v2 builder', () => {
 		await ownedRules.register(response);
 
 		expect(response.status()).toBe(201);
-		expect(new URL(response.url()).pathname).toBe(`${BASE_PATH}/api/v2/rules`);
+		expect(new URL(response.url()).pathname).toBe('/api/v2/rules');
 
 		const body = response.request().postDataJSON();
 		expect(body.schemaVersion).toBe('v2alpha1');

tests/e2e/tests/alerts/details/chrome.spec.ts

@@ -15,8 +15,7 @@ test.describe('Alert details — page chrome', () => {
 		await page.context().grantPermissions(['clipboard-read', 'clipboard-write']);
 
 		await gotoAlertHistory(page, alertHistory.ruleId);
-		// The served URL: base path mode strips the prefix from `page.url()`.
-		const expected = page.mainFrame().url();
+		const expected = page.url();
 
 		await page.getByRole('button', { name: 'Copy link' }).click();
 		await expect(page.getByText('Copied')).toBeVisible();

tests/e2e/tests/alerts/page.spec.ts

@@ -27,8 +27,7 @@ test.describe('Alerts page shell', () => {
 		await page.goto(ALERTS_LIST_PATH);
 
 		// No `tab` param at all — `getActiveKey()` falls back to AlertRules.
-		await expect(page).toHaveURL(new RegExp(`${ALERTS_LIST_PATH}(\\?|$)`));
-		await expect(page).not.toHaveURL(/[?&]tab=/);
+		await expect(page).toHaveURL(ALERTS_LIST_PATH);
 		await expect(
 			page.getByRole('tab', { name: TAB_NAMES.rules }),
 		).toHaveAttribute('aria-selected', 'true');

tests/e2e/tests/llm-o11y/llm-pricing.spec.ts

@@ -33,8 +33,6 @@ test.describe('LLM Observability — Model Pricing', () => {
 		await expect(page.getByTestId('drawer-model-id-input')).toBeVisible();
 
 		await page.getByTestId('drawer-model-id-input').fill(MODEL_NAME);
-		await page.getByTestId('drawer-pattern-input').fill(MODEL_NAME);
-		await page.getByTestId('drawer-pattern-add-btn').click();
 		await page.getByTestId('drawer-input-cost').fill(INPUT_COST);
 		await page.getByTestId('drawer-output-cost').fill(OUTPUT_COST);
 

tests/e2e/tests/routing/guards.spec.ts

@@ -1,45 +0,0 @@
-import { expect, PATH, test } from '../../drivers/routing';
-
-// `<Redirect>` replaces the history entry and v7's `<Navigate>` pushes unless
-// told otherwise, which only shows when someone presses Back. Runs as `guest`:
-// an authenticated page would skip the chain under test.
-
-test.describe('Routing — auth guards', () => {
-	test('TC-14 a deep-linked private route survives the login round trip', async ({
-		guest,
-	}) => {
-		await guest.goto(PATH.services);
-		await guest.waitForPath(PATH.login);
-
-		await guest.login();
-
-		// Private.tsx stashed the requested path and redirects back to it.
-		await guest.waitForPath(PATH.services);
-		expect(guest.url().pathname).toBe(PATH.services);
-	});
-
-	test('TC-15 the login redirects replace, so Back does not re-run the chain', async ({
-		guest,
-	}) => {
-		const depthBeforeGoto = await guest.historyDepth();
-
-		await guest.goto(PATH.services);
-		await guest.waitForPath(PATH.login);
-
-		// A pushing redirect would read one higher.
-		const depthAtLogin = await guest.historyDepth();
-		expect(depthAtLogin).toBe(depthBeforeGoto + 1);
-
-		await guest.login();
-		await guest.waitForPath(PATH.services);
-		expect(await guest.historyDepth()).toBe(depthAtLogin + 1);
-
-		// Back reaches the replaced /login entry, where being logged in redirects
-		// straight out again.
-		await guest.goBack();
-		await expect
-			.poll(() => guest.url().pathname, { timeout: 15_000 })
-			.not.toBe(PATH.login);
-		expect(guest.url().pathname).toBe(PATH.services);
-	});
-});

tests/e2e/tests/routing/mount.spec.ts

@@ -1,49 +0,0 @@
-import { expect, PATH, test } from '../../drivers/routing';
-
-// The shape of the router mount, which no other spec observes.
-
-test.describe('Routing: router mount', () => {
-	// Under a React transition the previous screen stays up instead of the
-	// Suspense fallback, so an uncached route renders no loader at all.
-	test('TC-18 an in-app navigation to an uncached route commits the Suspense fallback', async ({
-		authedPage: page,
-		routing,
-	}) => {
-		await routing.dashboards.gotoList();
-
-		await routing.whileScriptsHeld(async () => {
-			await routing.sidebarItem('Alerts').click();
-			await routing.waitForPath(PATH.alerts);
-
-			await expect(routing.dashboards.landmark()).toBeHidden();
-			await expect(
-				page.getByRole('img', { name: 'loading' }).first(),
-			).toBeVisible();
-		});
-
-		await expect(
-			page
-				.getByRole('heading', { name: 'Alert Rules' })
-				.or(page.getByTestId('list-alerts-search-input')),
-		).toBeVisible();
-	});
-
-	// nuqs' react-router adapter needs a router above it; the wrong order throws
-	// on the first page that reads a nuqs param.
-	test('TC-19 a page with nuqs params mounts with no router-context error', async ({
-		authedPage: page,
-		routing,
-	}) => {
-		const reported: string[] = [];
-		page.on('pageerror', (error) => reported.push(error.message));
-		page.on('console', (message) => reported.push(message.text()));
-
-		await routing.k8s.goto({ relativeTime: '30m' });
-
-		expect(
-			reported.filter((text) =>
-				/useNavigate|useSearchParams|context of a <Router>/i.test(text),
-			),
-		).toEqual([]);
-	});
-});

tests/e2e/tests/routing/nav-blocker.spec.ts

@@ -1,62 +0,0 @@
-import {
-	expect,
-	onAdminPage,
-	PATH,
-	routingDriver,
-	test,
-	uniqueAlphaSuffix,
-} from '../../drivers/routing';
-
-// `/settings/roles/new` is the only `useNavigationBlocker` consumer, so this is
-// the whole observable surface of the blocker protocol.
-
-// Both tests drive the create form; keep them off each other's role names.
-test.describe.configure({ mode: 'serial' });
-
-const BLOCKED_ROLE_NAME = `routing-blocker-${uniqueAlphaSuffix()}`;
-const SAVED_ROLE_NAME = `routing-bypass-${uniqueAlphaSuffix()}`;
-
-test.describe('Routing — unsaved-changes navigation blocker', () => {
-	test.afterAll(async ({ browser }) => {
-		await onAdminPage(browser, (page) =>
-			routingDriver(page).roles.removeByName([BLOCKED_ROLE_NAME, SAVED_ROLE_NAME]),
-		);
-	});
-
-	test('TC-16 a blocked navigation can be cancelled and then confirmed', async ({
-		routing,
-	}) => {
-		const { roles } = routing;
-		await roles.openCreateForm(BLOCKED_ROLE_NAME);
-
-		await roles.cancel();
-		await expect(roles.discardDialog()).toBeVisible();
-
-		// Cancel drops the blocked transition rather than retrying it.
-		await roles
-			.discardDialog()
-			.getByRole('button', { name: 'Keep editing' })
-			.click();
-		await expect(roles.discardDialog()).toBeHidden();
-		expect(routing.url().pathname).toBe(PATH.roleCreate);
-		await expect(roles.nameInput()).toHaveValue(BLOCKED_ROLE_NAME);
-
-		await roles.cancel();
-		await roles.discardDialog().getByRole('button', { name: 'Discard' }).click();
-		await routing.waitForPath(PATH.roles);
-	});
-
-	test('TC-17 saving bypasses the blocker for the next navigation', async ({
-		routing,
-	}) => {
-		const { roles } = routing;
-		await roles.openCreateForm(SAVED_ROLE_NAME);
-
-		// `allowNextNavigation()` unarms the blocker for the push after a save.
-		await roles.save();
-		await routing.waitForPath(PATH.roles);
-
-		await expect(roles.discardDialog()).toHaveCount(0);
-		await expect(roles.settings()).toBeVisible();
-	});
-});

tests/e2e/tests/routing/navigation.spec.ts

@@ -1,87 +0,0 @@
-import { dashboardListParams, expect, PATH, test } from '../../drivers/routing';
-
-// Imperative navigation: the `history.listen` counter behind `hasInAppHistory()`,
-// `useSafeNavigate`'s same-url suppression, and its `newTab` branch.
-
-test.describe('Routing — imperative navigation', () => {
-	test('TC-05 Back from a detail page restores the list with its params', async ({
-		routing,
-		dashboard,
-	}) => {
-		await routing.dashboards.gotoList(dashboard.title);
-		await routing.dashboards.row(dashboard.title).click();
-		await routing.waitForPath(dashboard.path);
-
-		await routing.goBackTo(PATH.dashboards);
-
-		expect(routing.params()).toMatchObject(dashboardListParams(dashboard.title));
-	});
-
-	// Both branches of the trace header's Back button in one document:
-	// `hasInAppHistory() ? goBack() : push(TRACES_EXPLORER)`.
-	test('TC-06 the trace-details previous button pushes when deep-linked and pops once in-app', async ({
-		routing,
-		largeTrace: trace,
-	}) => {
-		await routing.goto(PATH.services);
-		await routing.trace.goto(trace);
-
-		// The document load reset the counter, so Back pushes the explorer.
-		const depthBeforePush = await routing.historyDepth();
-		await routing.trace.back();
-		await routing.waitForPath(PATH.tracesExplorer);
-		expect(routing.url().searchParams.has('selectedExplorerView')).toBe(false);
-		expect(await routing.historyDepth()).toBe(depthBeforePush + 1);
-
-		// That push is in-app history, so after a POP back Back pops too.
-		await routing.goBackTo(routing.trace.path(trace));
-		await expect(routing.trace.rootRow(trace)).toBeVisible();
-
-		const depthBeforePop = await routing.historyDepth();
-		await routing.trace.back();
-		await routing.waitForPath(PATH.services);
-		expect(await routing.historyDepth()).toBe(depthBeforePop);
-	});
-
-	test('TC-07 re-selecting the current relative time adds no history entry', async ({
-		routing,
-	}) => {
-		test.slow();
-
-		await routing.k8s.goto({ relativeTime: '30m' });
-		await routing.expectRelativeTime('30m');
-		const before = routing.params();
-		const depthBefore = await routing.historyDepth();
-
-		await routing.selectRelativeTime('30m');
-
-		// `areUrlsEffectivelySame` ignores the regenerated compositeQuery `id`. Not
-		// followed by "one Back leaves the page": the k8s list pushes its own
-		// compositeQuery rewrite on mount.
-		expect(await routing.historyDepth()).toBe(depthBefore);
-		expect(routing.url().pathname).toBe(PATH.k8s);
-		expect(routing.params()).toMatchObject({
-			relativeTime: '30m',
-			category: before.category,
-		});
-		await routing.expectRelativeTime('30m');
-	});
-
-	test('TC-08 modifier-clicking an in-app link opens the same url in a new tab', async ({
-		routing,
-		dashboard,
-	}) => {
-		await routing.dashboards.gotoList(dashboard.title);
-
-		await routing.inNewTab(
-			routing.dashboards.row(dashboard.title),
-			async (tab) => {
-				expect(tab.url().pathname).toBe(dashboard.path);
-				await expect(tab.dashboards.title()).toHaveText(dashboard.title);
-			},
-		);
-
-		expect(routing.url().pathname).toBe(PATH.dashboards);
-		expect(routing.params()).toMatchObject(dashboardListParams(dashboard.title));
-	});
-});

tests/e2e/tests/routing/route-matching.spec.ts

@@ -1,84 +0,0 @@
-import { expect, PATH, test } from '../../drivers/routing';
-
-// Every place a `matchPath` / `generatePath` call decides what renders:
-// `RouteTab`, `TopNav`'s per-route checks, and `SETTINGS`, a prefix route that
-// needs an explicit `/*` under v7.
-
-test.describe('Routing — route matching', () => {
-	test('TC-09 RouteTab switches the url and survives a reload', async ({
-		routing,
-	}) => {
-		await routing.goto(PATH.metricsSummary);
-		await expect(routing.activeRouteTab(PATH.metricsSummary)).toBeVisible();
-
-		await routing.routeTab(PATH.metricsViews).click();
-		await routing.waitForPath(PATH.metricsViews);
-		await expect(routing.activeRouteTab(PATH.metricsViews)).toBeVisible();
-
-		await routing.reload();
-		expect(routing.url().pathname).toBe(PATH.metricsViews);
-		await expect(routing.activeRouteTab(PATH.metricsViews)).toBeVisible();
-	});
-
-	test('TC-10 a prefix-route deep link loads with the right tab selected', async ({
-		authedPage: page,
-		routing,
-	}) => {
-		await routing.goto(PATH.roles);
-
-		expect(routing.url().pathname).toBe(PATH.roles);
-		await expect(page.getByTestId('settings-page-sidenav')).toBeVisible();
-		await expect(page.getByTestId('roles')).toHaveClass(/active/);
-		await expect(routing.roles.settings()).toBeVisible();
-	});
-
-	test('TC-11 a seeded dashboard id round-trips byte-identical', async ({
-		routing,
-		dashboard,
-	}) => {
-		await routing.dashboards.gotoList(dashboard.title);
-		await routing.dashboards.row(dashboard.title).click();
-
-		// Exact match: any re-encoding of the uuid fails here.
-		await routing.waitForPath(dashboard.path);
-		await expect(routing.dashboards.title()).toHaveText(dashboard.title);
-
-		await routing.reload();
-		expect(routing.url().pathname).toBe(dashboard.path);
-		await expect(routing.dashboards.title()).toHaveText(dashboard.title);
-	});
-
-	test('TC-12 the global time picker renders only where matchPath allows it', async ({
-		routing,
-	}) => {
-		await routing.goto(`${PATH.services}?relativeTime=30m`);
-		await expect(routing.globalTimePicker()).toBeVisible();
-
-		// LOGS_EXPLORER is in `routesToDisable`.
-		await routing.gotoLogsExplorer();
-		await expect(routing.globalTimePicker()).toHaveCount(0);
-
-		// ROLES_SETTINGS is in `routesToSkip`.
-		await routing.goto(PATH.roles);
-		await expect(routing.roles.settings()).toBeVisible();
-		await expect(routing.globalTimePicker()).toHaveCount(0);
-	});
-
-	// `PrivateRoute` redirects a logged-in user on an unknown path to HOME before
-	// the catch-all runs, so `NotFound` is unreachable while authenticated.
-	test('TC-13 an unknown path redirects home and replaces its history entry', async ({
-		authedPage: page,
-		routing,
-	}) => {
-		await routing.dashboards.gotoList();
-		const depthBefore = await routing.historyDepth();
-
-		await routing.goto(PATH.unknown);
-		await routing.waitForPath(PATH.home);
-		await expect(page.getByTestId('not-found')).toHaveCount(0);
-
-		// The redirect replaced the entry, so one Back reaches the list.
-		expect(await routing.historyDepth()).toBe(depthBefore + 1);
-		await routing.goBackTo(PATH.dashboards);
-	});
-});

tests/e2e/tests/routing/url-state.spec.ts

@@ -1,83 +0,0 @@
-import { expect, PATH, test } from '../../drivers/routing';
-
-// The nuqs adapter swap. On the k8s list `groupBy` is written by nuqs straight
-// to the History API with `history: 'push'`, while `relativeTime` is written by
-// the router through `useSafeNavigate`.
-
-test.describe('Routing — nuqs and router param coexistence', () => {
-	test('TC-01 a router write keeps the nuqs params it did not author', async ({
-		routing,
-		pods,
-	}) => {
-		await routing.k8s.goto({ relativeTime: '30m' });
-
-		await routing.k8s.groupBy(pods.groupBy);
-		await routing.selectRelativeTime('1h');
-		await routing.waitForParam('relativeTime', '1h');
-
-		expect(routing.url().pathname).toBe(PATH.k8s);
-		expect(routing.params()).toMatchObject({
-			relativeTime: '1h',
-			category: 'pods',
-		});
-		expect(routing.params().groupBy).toContain(pods.groupBy);
-		await expect(routing.k8s.groupBySelect()).toContainText(pods.groupBy);
-	});
-
-	test('TC-02 a nuqs write keeps the relativeTime the router authored', async ({
-		routing,
-		pods,
-	}) => {
-		await routing.k8s.goto({ relativeTime: '30m' });
-
-		await routing.selectRelativeTime('6h');
-		await routing.waitForParam('relativeTime', '6h');
-
-		await routing.k8s.groupBy(pods.groupBy);
-
-		expect(routing.url().pathname).toBe(PATH.k8s);
-		expect(routing.params().relativeTime).toBe('6h');
-		expect(routing.params().groupBy).toContain(pods.groupBy);
-		await routing.expectRelativeTime('6h');
-	});
-
-	test('TC-03 POP across a nuqs push reverts both url and list', async ({
-		routing,
-		pods,
-	}) => {
-		await routing.k8s.goto({ relativeTime: '30m' });
-
-		// One flush, one entry: otherwise one Back lands on an intermediate url.
-		const depthBeforeGroupBy = await routing.historyDepth();
-		await routing.k8s.groupBy(pods.groupBy);
-		expect(await routing.historyDepth()).toBe(depthBeforeGroupBy + 1);
-		await expect(routing.k8s.groupBySelect()).toContainText(pods.groupBy);
-
-		await routing.goBack();
-		await routing.k8s.waitUntilGrouped(pods.groupBy, false);
-		expect(routing.url().pathname).toBe(PATH.k8s);
-		await expect(routing.k8s.groupBySelect()).not.toContainText(pods.groupBy);
-
-		await routing.goForward();
-		await routing.k8s.waitUntilGrouped(pods.groupBy);
-		await expect(routing.k8s.groupBySelect()).toContainText(pods.groupBy);
-	});
-
-	test('TC-04 a deep link carrying both families applies both on first paint', async ({
-		routing,
-		pods,
-	}) => {
-		await routing.k8s.goto({
-			relativeTime: '6h',
-			groupBy: JSON.stringify([pods.groupBy]),
-		});
-
-		// `k8s.goto` waited for the mount-time republish, so anything it dropped is
-		// missing by now.
-		expect(routing.url().pathname).toBe(PATH.k8s);
-		expect(routing.params().relativeTime).toBe('6h');
-		expect(routing.params().groupBy).toContain(pods.groupBy);
-		await routing.expectRelativeTime('6h');
-		await expect(routing.k8s.groupBySelect()).toContainText(pods.groupBy);
-	});
-});

tests/e2e/tsconfig.json

@@ -18,6 +18,6 @@
     "outDir": "./dist",
     "rootDir": "."
   },
-  "include": ["tests/**/*.ts", "drivers/**/*.ts", "helpers/**/*.ts", "fixtures/**/*.ts", "bootstrap/**/*.ts", "playwright.config.ts"],
+  "include": ["tests/**/*.ts", "helpers/**/*.ts", "fixtures/**/*.ts", "bootstrap/**/*.ts", "playwright.config.ts"],
   "exclude": ["node_modules", "dist"]
 }

tests/fixtures/auth.py

@@ -36,6 +36,28 @@ USERS_BASE = "/api/v2/users"
 USER_ROLES_BASE = "/api/v2/user_roles"
 
 
+def _login(signoz: types.SigNoz, email: str, password: str) -> str:
+    """Complete GET /sessions/context + POST /sessions/email_password; return accessToken."""
+    ctx = requests.get(
+        signoz.self.host_configs["8080"].get("/api/v2/sessions/context"),
+        params={
+            "email": email,
+            "ref": f"{signoz.self.host_configs['8080'].base()}",
+        },
+        timeout=5,
+    )
+    assert ctx.status_code == HTTPStatus.OK
+    org_id = ctx.json()["data"]["orgs"][0]["id"]
+
+    login = requests.post(
+        signoz.self.host_configs["8080"].get("/api/v2/sessions/email_password"),
+        json={"email": email, "password": password, "orgId": org_id},
+        timeout=5,
+    )
+    assert login.status_code == HTTPStatus.OK
+    return login.json()["data"]["accessToken"]
+
+
 def register_admin(
     signoz: types.SigNoz,
     request: pytest.FixtureRequest,
@@ -160,14 +182,16 @@ def get_tokens(signoz: types.SigNoz) -> Callable[[str, str], tuple[str, str]]:
     return tokens_getter(signoz)
 
 
-def license_applier(
+@pytest.fixture(name="apply_license", scope="package")
+def apply_license(
     signoz: types.SigNoz,
+    create_user_admin: types.Operation,  # pylint: disable=unused-argument,redefined-outer-name
     request: pytest.FixtureRequest,
     pytestconfig: pytest.Config,
-    cache_key: str = "apply_license",
-    base_path: str = "",
 ) -> types.Operation:
-    """Apply the ENTERPRISE license and complete org onboarding, under base_path. Reuse-wrapped."""
+    """Stub Zeus license-lookup, then POST /api/v4/licenses so the BE flips
+    to ENTERPRISE. Package-scoped so an e2e bootstrap can pull it in and
+    every spec inherits the licensed state."""
 
     def create() -> types.Operation:
         Config.base_url = signoz.zeus.host_configs["8080"].get("/__admin")
@@ -200,12 +224,12 @@ def license_applier(
             )
         )
 
-        access_token = token_getter(signoz, base_path)(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+        access_token = _login(signoz, USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
         # 201 = applied, 409 = already applied. Retry transient failures —
         # the BE occasionally 5xxs right after startup before the license
         # sync goroutine is ready.
-        license_url = signoz.self.host_configs["8080"].get(f"{base_path}/api/v4/licenses")
+        license_url = signoz.self.host_configs["8080"].get("/api/v4/licenses")
         auth_header = {"Authorization": f"Bearer {access_token}"}
         for attempt in range(10):
             resp = requests.post(
@@ -224,7 +248,7 @@ def license_applier(
         # redirects first-time admins to a questionnaire. Mark the preference
         # complete so specs can navigate directly to the feature under test.
         pref_resp = requests.put(
-            signoz.self.host_configs["8080"].get(f"{base_path}/api/v1/org/preferences/org_onboarding"),
+            signoz.self.host_configs["8080"].get("/api/v1/org/preferences/org_onboarding"),
             json={"value": True},
             headers=auth_header,
             timeout=5,
@@ -241,7 +265,7 @@ def license_applier(
     return reuse.wrap(
         request,
         pytestconfig,
-        cache_key,
+        "apply_license",
         lambda: types.Operation(name=""),
         create,
         delete,
@@ -249,19 +273,6 @@ def license_applier(
     )
 
 
-@pytest.fixture(name="apply_license", scope="package")
-def apply_license(
-    signoz: types.SigNoz,
-    create_user_admin: types.Operation,  # pylint: disable=unused-argument,redefined-outer-name
-    request: pytest.FixtureRequest,
-    pytestconfig: pytest.Config,
-) -> types.Operation:
-    """Stub Zeus license-lookup, then POST /api/v4/licenses so the BE flips
-    to ENTERPRISE. Package-scoped so an e2e bootstrap can pull it in and
-    every spec inherits the licensed state."""
-    return license_applier(signoz, request, pytestconfig)
-
-
 # This is not a fixture purposefully, we just want to add a license to the signoz instance.
 # This is also idempotent in nature.
 def add_license(