SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.
TypeScript apmapplication-monitoringdistributed-tracinggogood-first-issuejaegerloglogsmetricsmonitoringnextjsobservabilityopen-sourceopentelemetryprometheusreactreactjsself-hostedtracingtypescript
feat(explorer): create alert and add to dashboard actions in the explorer views (#12981)
Aditya Singhadfcebf855bf
diff --git a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.test.tsx b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.test.tsxindex 5a8c05dd3e..4c65fc6eda 100644--- a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.test.tsx+++ b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.test.tsx@@ -106,7 +106,7 @@ describe.each([renderWithStore(dataSource);const button = screen.getByTestId(testId);expect(button).toBeInTheDocument();- expect(button).toHaveClass('periscope-btn', 'ghost');+ expect(button).toHaveAccessibleName('Download');});it('shows popover with export options when download button is clicked', () => {diff --git a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsxindex f8f21713ef..e2d464c930 100644--- a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx+++ b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx@@ -1,11 +1,12 @@import { useCallback, useMemo, useState } from 'react';-import { Button, Popover, Tooltip } from 'antd';+import { Popover, Tooltip } from 'antd';+import { Button } from '@signozhq/ui/button';import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';import { Typography } from '@signozhq/ui/typography';import { TelemetryFieldKey } from 'api/v5/v5';import { PANEL_TYPES } from 'constants/queryBuilder';import { useExportRawData } from 'hooks/useExportData/useServerExport';-import { Download, LoaderCircle } from '@signozhq/icons';+import { Download } from '@signozhq/icons';import { DataSource } from 'types/common/queryBuilder';import {@@ -111,8 +112,9 @@ export default function DownloadOptionsMenu({)}<Button- type="primary"- icon={<Download size={16} />}+ variant="solid"+ color="primary"+ prefix={<Download size={16} />}onClick={handleExport}className="export-button"disabled={isDownloading}@@ -144,16 +146,14 @@ export default function DownloadOptionsMenu({><Tooltip title="Download" placement="top"><Button- className="periscope-btn ghost"- icon={- isDownloading ? (- <LoaderCircle size={14} className="animate-spin" />- ) : (- <Download size={14} />- )- }+ variant="ghost"+ color="secondary"+ size="icon"+ prefix={<Download size={14} />}+ aria-label="Download"data-testid={`periscope-btn-download-${dataSource}`}disabled={isDownloading}+ loading={isDownloading}/></Tooltip></Popover>diff --git a/frontend/src/container/ExplorerActions/AddToDashboardButton.tsx b/frontend/src/container/ExplorerActions/AddToDashboardButton.tsxnew file mode 100644index 0000000000..e62eece8e2--- /dev/null+++ b/frontend/src/container/ExplorerActions/AddToDashboardButton.tsx@@ -0,0 +1,109 @@+import { useState } from 'react';+import { Grid2X2 } from '@signozhq/icons';+import { Button } from '@signozhq/ui/button';+import { TooltipSimple } from '@signozhq/ui/tooltip';+import logEvent from 'api/common/logEvent';+import { PANEL_TYPES } from 'constants/queryBuilder';+import ExportPanelContainer from 'container/ExportPanel/ExportPanelContainer';+import { ExportDashboard } from 'hooks/dashboard/useExportDashboards';+import { useGetExportToDashboardLink } from 'hooks/dashboard/useGetExportToDashboardLink';+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';+import { useSafeNavigate } from 'hooks/useSafeNavigate';+import { Query } from 'types/api/queryBuilder/queryBuilderData';+import { DataSource } from 'types/common/queryBuilder';+import { v4 } from 'uuid';++import {+ EXPLORER_ACTION_EVENTS,+ getExplorerActionEventPayload,+ getExportPanelType,+} from './utils';++function AddToDashboardButton({+ query,+ sourcepage,+ panelType,+ isOneChartPerQuery = false,+}: {+ query: Query | null;+ sourcepage: DataSource;+ panelType?: PANEL_TYPES;+ isOneChartPerQuery?: boolean;+}): JSX.Element {+ const [queryToExport, setQueryToExport] = useState<Query | null>(null);+ const { panelType: contextPanelType } = useQueryBuilder();+ const { safeNavigate } = useSafeNavigate();+ const getExportToDashboardLink = useGetExportToDashboardLink();++ const open = (): void => {+ if (!query) {+ return;+ }+ void logEvent(+ EXPLORER_ACTION_EVENTS[sourcepage].addToDashboard,+ getExplorerActionEventPayload({+ sourcepage,+ panelType: contextPanelType,+ isOneChartPerQuery,+ }),+ );+ setQueryToExport(query);+ };++ const handleExport = (+ dashboard: ExportDashboard | null,+ isNewDashboard?: boolean,+ ): void => {+ if (!dashboard || !queryToExport) {+ return;+ }+ const exportPanelType = panelType ?? getExportPanelType(contextPanelType);++ void logEvent(EXPLORER_ACTION_EVENTS[sourcepage].exported, {+ ...getExplorerActionEventPayload({+ sourcepage,+ panelType: contextPanelType,+ isOneChartPerQuery,+ }),+ isNewDashboard,+ dashboardName: dashboard.title,+ });++ const link = getExportToDashboardLink({+ query: queryToExport,+ panelType: exportPanelType,+ dashboardId: dashboard.id,+ widgetId: v4(),+ });+ if (link) {+ safeNavigate(link);+ }+ };++ const button = (+ <Button+ variant="ghost"+ color="secondary"+ size="icon"+ disabled={!query}+ onClick={open}+ prefix={<Grid2X2 size={16} />}+ aria-label="Add to dashboard"+ data-testid="explorer-add-to-dashboard"+ />+ );++ return (+ <>+ <TooltipSimple title="Add to dashboard">{button}</TooltipSimple>+ <ExportPanelContainer+ open={queryToExport !== null}+ onClose={(): void => setQueryToExport(null)}+ query={queryToExport}+ onExport={handleExport}+ />+ </>+ );+}++export default AddToDashboardButton;diff --git a/frontend/src/container/ExplorerActions/CreateAlertButton.tsx b/frontend/src/container/ExplorerActions/CreateAlertButton.tsxnew file mode 100644index 0000000000..e970346ef3--- /dev/null+++ b/frontend/src/container/ExplorerActions/CreateAlertButton.tsx@@ -0,0 +1,61 @@+import { useHistory } from 'react-router-dom';+import { ConciergeBell } from '@signozhq/icons';+import { Button } from '@signozhq/ui/button';+import { TooltipSimple } from '@signozhq/ui/tooltip';+import logEvent from 'api/common/logEvent';+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';+import { Query } from 'types/api/queryBuilder/queryBuilderData';+import { DataSource } from 'types/common/queryBuilder';++import {+ EXPLORER_ACTION_EVENTS,+ getCreateAlertLink,+ getExplorerActionEventPayload,+} from './utils';++function CreateAlertButton({+ query,+ sourcepage,+ isOneChartPerQuery = false,+}: {+ query: Query | null;+ sourcepage: DataSource;+ isOneChartPerQuery?: boolean;+}): JSX.Element {+ const history = useHistory();+ const { panelType } = useQueryBuilder();++ const createAlert = (): void => {+ if (!query) {+ return;+ }+ void logEvent(+ EXPLORER_ACTION_EVENTS[sourcepage].createAlert,+ getExplorerActionEventPayload({ sourcepage, panelType, isOneChartPerQuery }),+ );+ history.push(getCreateAlertLink({ query, panelType }));+ };++ const button = (+ <Button+ variant="ghost"+ color="secondary"+ size={isOneChartPerQuery ? 'icon' : 'md'}+ disabled={!query}+ onClick={createAlert}+ prefix={<ConciergeBell size={16} />}+ aria-label="Create an alert"+ data-testid="explorer-create-alert"+ >+ {!isOneChartPerQuery && 'Create an alert'}+ </Button>+ );++ return isOneChartPerQuery ? (+ <TooltipSimple title="Create an alert">{button}</TooltipSimple>+ ) : (+ button+ );+}++export default CreateAlertButton;diff --git a/frontend/src/container/ExplorerActions/ExplorerActions.tsx b/frontend/src/container/ExplorerActions/ExplorerActions.tsxnew file mode 100644index 0000000000..5c731bf309--- /dev/null+++ b/frontend/src/container/ExplorerActions/ExplorerActions.tsx@@ -0,0 +1,39 @@+import { PANEL_TYPES } from 'constants/queryBuilder';+import { Query } from 'types/api/queryBuilder/queryBuilderData';+import { DataSource } from 'types/common/queryBuilder';++import AddToDashboardButton from './AddToDashboardButton';+import CreateAlertButton from './CreateAlertButton';++function ExplorerActions({+ query,+ dashboardQuery = query,+ sourcepage,+ panelType,+ isOneChartPerQuery,+}: {+ query: Query | null;+ // When the dashboard export differs from the alert one (traces list injects columns).+ dashboardQuery?: Query | null;+ sourcepage: DataSource;+ panelType?: PANEL_TYPES;+ isOneChartPerQuery?: boolean;+}): JSX.Element {+ return (+ <>+ <CreateAlertButton+ query={query}+ sourcepage={sourcepage}+ isOneChartPerQuery={isOneChartPerQuery}+ />+ <AddToDashboardButton+ query={dashboardQuery}+ sourcepage={sourcepage}+ panelType={panelType}+ isOneChartPerQuery={isOneChartPerQuery}+ />+ </>+ );+}++export default ExplorerActions;diff --git a/frontend/src/container/ExplorerActions/__tests__/AddToDashboardButton.test.tsx b/frontend/src/container/ExplorerActions/__tests__/AddToDashboardButton.test.tsxnew file mode 100644index 0000000000..8cbf01bcc2--- /dev/null+++ b/frontend/src/container/ExplorerActions/__tests__/AddToDashboardButton.test.tsx@@ -0,0 +1,320 @@+import logEvent from 'api/common/logEvent';+import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';+import {+ getExportQueryData as getLogsExportQuery,+ getQueryByPanelType as getLogsQueryByPanelType,+} from 'container/LogsExplorerViews/explorerUtils';+import { OptionsQuery } from 'container/OptionsMenu/types';+import {+ getExportQueryData as getTracesExportQuery,+ getQueryByPanelType as getTracesQueryByPanelType,+} from 'container/TracesExplorer/explorerUtils';+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';+import { useSafeNavigate } from 'hooks/useSafeNavigate';+import { buildExportPanelLink } from 'pages/DashboardPage/DashboardContainer/PanelEditor/newPanelRoute';+import { render, screen, userEvent } from 'tests/test-utils';+import { Query } from 'types/api/queryBuilder/queryBuilderData';+import { DataSource, StringOperators } from 'types/common/queryBuilder';++import AddToDashboardButton from '../AddToDashboardButton';+import { getExportPanelType } from '../utils';++const DASHBOARD = { id: 'dash-1', title: 'Dash 1' };++jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({+ useQueryBuilder: jest.fn(),+}));+jest.mock('hooks/useSafeNavigate', () => ({+ useSafeNavigate: jest.fn(),+}));+jest.mock('uuid', () => ({ v4: (): string => 'widget-1' }));+jest.mock('api/common/logEvent', () => ({+ __esModule: true,+ default: jest.fn(() => Promise.resolve()),+}));+// The picker is the dialog's business; here it just hands a dashboard back.+jest.mock('container/ExportPanel/ExportPanelContainer', () => ({+ __esModule: true,+ default: ({+ open,+ query,+ onExport,+ }: {+ open: boolean;+ query: Query | null;+ onExport: (dashboard: { id: string; title: string }) => void;+ }): JSX.Element | null =>+ open ? (+ <button+ type="button"+ data-testid="export-stub"+ data-query={JSON.stringify(query)}+ onClick={(): void => onExport({ id: 'dash-1', title: 'Dash 1' })}+ >+ export+ </button>+ ) : null,+}));++const mockSafeNavigate = jest.fn();+const mockedUseQueryBuilder = jest.mocked(useQueryBuilder);+const mockedUseSafeNavigate = jest.mocked(useSafeNavigate);+const mockedLogEvent = jest.mocked(logEvent);++const FILTER = "service.name = 'frontend'";+const COLUMNS = [{ name: 'service.name' }, { name: 'name' }];+const options = { selectColumns: COLUMNS } as unknown as OptionsQuery;++function stagedQuery(dataSource: DataSource, queryName = 'A'): Query {+ const base = initialQueriesMap[dataSource];+ return {+ ...base,+ id: `query-${queryName}`,+ builder: {+ ...base.builder,+ queryData: [+ {+ ...base.builder.queryData[0],+ queryName,+ aggregateOperator: StringOperators.COUNT,+ filter: { expression: FILTER },+ orderBy: [{ columnName: 'timestamp', order: 'asc' }],+ groupBy: [{ key: 'service.name', dataType: 'string', type: 'resource' }],+ },+ ],+ },+ } as Query;+}++function setPanelType(panelType: PANEL_TYPES): void {+ mockedUseQueryBuilder.mockReturnValue({ panelType } as ReturnType<+ typeof useQueryBuilder+ >);+}++async function exportTo(+ query: Query | null,+ sourcepage: DataSource,+ panelType: PANEL_TYPES,+ panelTypeProp?: PANEL_TYPES,+): Promise<void> {+ setPanelType(panelType);+ render(+ <AddToDashboardButton+ query={query}+ sourcepage={sourcepage}+ panelType={panelTypeProp}+ />,+ );+ const user = userEvent.setup();+ await user.click(screen.getByTestId('explorer-add-to-dashboard'));+ await user.click(screen.getByTestId('export-stub'));+}++function expectedLink(query: Query, panelType: PANEL_TYPES): string | null {+ return buildExportPanelLink({+ query,+ panelType,+ dashboardId: DASHBOARD.id,+ });+}++describe('AddToDashboardButton', () => {+ beforeEach(() => {+ mockSafeNavigate.mockReset();+ mockedLogEvent.mockClear();+ mockedUseSafeNavigate.mockReturnValue({ safeNavigate: mockSafeNavigate });+ });++ it('is disabled without a query and the picker stays closed', () => {+ setPanelType(PANEL_TYPES.LIST);+ render(<AddToDashboardButton query={null} sourcepage={DataSource.LOGS} />);++ expect(screen.getByTestId('explorer-add-to-dashboard')).toBeDisabled();+ expect(screen.queryByTestId('export-stub')).not.toBeInTheDocument();+ });++ it('hands the picker the same query it will export', async () => {+ const query = stagedQuery(DataSource.LOGS);+ setPanelType(PANEL_TYPES.TIME_SERIES);+ render(<AddToDashboardButton query={query} sourcepage={DataSource.LOGS} />);++ await userEvent+ .setup()+ .click(screen.getByTestId('explorer-add-to-dashboard'));++ expect(screen.getByTestId('export-stub')).toHaveAttribute(+ 'data-query',+ JSON.stringify(query),+ );+ });++ it("logs the explorer's own open and success events", async () => {+ const query = stagedQuery(DataSource.TRACES);++ await exportTo(query, DataSource.TRACES, PANEL_TYPES.TABLE);++ expect(mockedLogEvent).toHaveBeenCalledWith(+ 'Traces Explorer: Add to dashboard clicked',+ {+ sourcepage: DataSource.TRACES,+ panelType: PANEL_TYPES.TABLE,+ },+ );+ expect(mockedLogEvent).toHaveBeenCalledWith(+ 'Traces Explorer: Add to dashboard successful',+ {+ sourcepage: DataSource.TRACES,+ panelType: PANEL_TYPES.TABLE,+ isNewDashboard: undefined,+ dashboardName: DASHBOARD.title,+ },+ );+ });++ it('a panel type from the page wins over the fold of the context one', async () => {+ const query = stagedQuery(DataSource.METRICS);++ // context says list, the page says time series+ await exportTo(+ query,+ DataSource.METRICS,+ PANEL_TYPES.LIST,+ PANEL_TYPES.TIME_SERIES,+ );++ expect(mockSafeNavigate).toHaveBeenCalledWith(+ expectedLink(query, PANEL_TYPES.TIME_SERIES),+ );+ });++ describe('logs, the query the page hands over per view', () => {+ const staged = stagedQuery(DataSource.LOGS);++ it('list: the list request shaping with timestamp desc, panel type list', async () => {+ const listRequest = getLogsQueryByPanelType(staged, PANEL_TYPES.LIST, {+ page: 1,+ pageSize: 100,+ filters: { items: [], op: 'AND' },+ filter: { expression: FILTER },+ });+ const exportQuery = getLogsExportQuery(+ listRequest,+ PANEL_TYPES.LIST,+ ) as Query;++ await exportTo(exportQuery, DataSource.LOGS, PANEL_TYPES.LIST);++ expect(exportQuery.builder.queryData[0].orderBy).toStrictEqual([+ { columnName: 'timestamp', order: 'desc' },+ ]);+ expect(mockSafeNavigate).toHaveBeenCalledWith(+ expectedLink(exportQuery, PANEL_TYPES.LIST),+ );+ });++ it.each([PANEL_TYPES.TIME_SERIES, PANEL_TYPES.TABLE])(+ '%s: staged query untouched, same panel type',+ async (panelType) => {+ const exportQuery = getLogsExportQuery(staged, panelType) as Query;++ await exportTo(exportQuery, DataSource.LOGS, panelType);++ expect(exportQuery).toBe(staged);+ expect(mockSafeNavigate).toHaveBeenCalledWith(+ expectedLink(staged, panelType),+ );+ },+ );+ });++ describe('traces, the query the page hands over per view', () => {+ const staged = stagedQuery(DataSource.TRACES);++ it('list: list shaping plus the selected columns, panel type list', async () => {+ const exportQuery = getTracesExportQuery(+ getTracesQueryByPanelType(staged, PANEL_TYPES.LIST),+ getExportPanelType(PANEL_TYPES.LIST),+ options,+ );++ await exportTo(exportQuery, DataSource.TRACES, PANEL_TYPES.LIST);++ const [queryData] = exportQuery.builder.queryData;+ expect(queryData.selectColumns).toStrictEqual(COLUMNS);+ expect(queryData.groupBy).toStrictEqual([]);+ expect(mockSafeNavigate).toHaveBeenCalledWith(+ expectedLink(exportQuery, PANEL_TYPES.LIST),+ );+ });++ it('trace: list shaping, no columns, panel type folds to time series', async () => {+ const exportQuery = getTracesExportQuery(+ getTracesQueryByPanelType(staged, PANEL_TYPES.TRACE),+ getExportPanelType(PANEL_TYPES.TRACE),+ options,+ );++ await exportTo(exportQuery, DataSource.TRACES, PANEL_TYPES.TRACE);++ expect(exportQuery.builder.queryData[0].selectColumns).toBeUndefined();+ expect(mockSafeNavigate).toHaveBeenCalledWith(+ expectedLink(exportQuery, PANEL_TYPES.TIME_SERIES),+ );+ });++ // Same as the alert: the list / trace order lives in ListView state and the+ // page shapes the export without it, so the panel query has no order by.+ it.each([PANEL_TYPES.LIST, PANEL_TYPES.TRACE])(+ '%s: order by is not carried into the panel query',+ async (panelType) => {+ expect(staged.builder.queryData[0].orderBy).toHaveLength(1);+ const exportQuery = getTracesExportQuery(+ getTracesQueryByPanelType(staged, panelType),+ getExportPanelType(panelType),+ options,+ );++ await exportTo(exportQuery, DataSource.TRACES, panelType);++ expect(exportQuery.builder.queryData[0].orderBy).toStrictEqual([]);+ expect(mockSafeNavigate).toHaveBeenCalledWith(+ expectedLink(exportQuery, getExportPanelType(panelType)),+ );+ },+ );++ it.each([PANEL_TYPES.TIME_SERIES, PANEL_TYPES.TABLE])(+ '%s: staged query untouched, same panel type',+ async (panelType) => {+ const exportQuery = getTracesExportQuery(+ getTracesQueryByPanelType(staged, panelType),+ getExportPanelType(panelType),+ options,+ );++ await exportTo(exportQuery, DataSource.TRACES, panelType);++ expect(exportQuery).toBe(staged);+ expect(mockSafeNavigate).toHaveBeenCalledWith(+ expectedLink(staged, panelType),+ );+ },+ );+ });++ it('metrics: the chart query as is, panel type time series from the page', async () => {+ const query = stagedQuery(DataSource.METRICS);++ await exportTo(+ query,+ DataSource.METRICS,+ PANEL_TYPES.TIME_SERIES,+ PANEL_TYPES.TIME_SERIES,+ );++ expect(mockSafeNavigate).toHaveBeenCalledWith(+ expectedLink(query, PANEL_TYPES.TIME_SERIES),+ );+ });+});diff --git a/frontend/src/container/ExplorerActions/__tests__/CreateAlertButton.test.tsx b/frontend/src/container/ExplorerActions/__tests__/CreateAlertButton.test.tsxnew file mode 100644index 0000000000..36d7a2c78a--- /dev/null+++ b/frontend/src/container/ExplorerActions/__tests__/CreateAlertButton.test.tsx@@ -0,0 +1,245 @@+import { useHistory } from 'react-router-dom';+import logEvent from 'api/common/logEvent';+import { QueryParams } from 'constants/query';+import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';+import ROUTES from 'constants/routes';+import {+ getExportQueryData as getLogsExportQuery,+ getQueryByPanelType as getLogsQueryByPanelType,+} from 'container/LogsExplorerViews/explorerUtils';+import { getQueryByPanelType as getTracesQueryByPanelType } from 'container/TracesExplorer/explorerUtils';+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';+import { render, screen, userEvent } from 'tests/test-utils';+import { Query } from 'types/api/queryBuilder/queryBuilderData';+import { DataSource, StringOperators } from 'types/common/queryBuilder';++import CreateAlertButton from '../CreateAlertButton';++jest.mock('react-router-dom', () => ({+ ...jest.requireActual('react-router-dom'),+ useHistory: jest.fn(),+}));+jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({+ useQueryBuilder: jest.fn(),+}));+jest.mock('api/common/logEvent', () => ({+ __esModule: true,+ default: jest.fn(() => Promise.resolve()),+}));++const mockPush = jest.fn();+const mockedUseHistory = jest.mocked(useHistory);+const mockedUseQueryBuilder = jest.mocked(useQueryBuilder);+const mockedLogEvent = jest.mocked(logEvent);++const FILTER = "service.name = 'frontend'";+const ORDER_BY = [{ columnName: 'timestamp', order: 'asc' }];++function stagedQuery(+ dataSource: DataSource,+ aggregateOperator: StringOperators,+ queryName = 'A',+): Query {+ const base = initialQueriesMap[dataSource];+ return {+ ...base,+ id: `query-${queryName}`,+ builder: {+ ...base.builder,+ queryData: [+ {+ ...base.builder.queryData[0],+ queryName,+ aggregateOperator,+ filter: { expression: FILTER },+ orderBy: ORDER_BY,+ groupBy: [{ key: 'service.name', dataType: 'string', type: 'resource' }],+ },+ ],+ },+ } as Query;+}++function pushedQuery(): Query {+ expect(mockPush).toHaveBeenCalledTimes(1);+ const [path, search] = (mockPush.mock.calls[0][0] as string).split('?');+ expect(path).toBe(ROUTES.ALERTS_NEW);+ const raw = new URLSearchParams(search).get(QueryParams.compositeQuery);+ return JSON.parse(raw as string);+}++function setPanelType(panelType: PANEL_TYPES): void {+ mockedUseQueryBuilder.mockReturnValue({ panelType } as ReturnType<+ typeof useQueryBuilder+ >);+}++async function clickCreateAlert(+ query: Query | null,+ sourcepage: DataSource,+ panelType: PANEL_TYPES,+): Promise<void> {+ setPanelType(panelType);+ render(<CreateAlertButton query={query} sourcepage={sourcepage} />);+ await userEvent.setup().click(screen.getByTestId('explorer-create-alert'));+}++describe('CreateAlertButton', () => {+ beforeEach(() => {+ mockPush.mockReset();+ mockedLogEvent.mockClear();+ mockedUseHistory.mockReturnValue({ push: mockPush } as unknown as ReturnType<+ typeof useHistory+ >);+ });++ it('is disabled and does nothing without a query', async () => {+ await clickCreateAlert(null, DataSource.LOGS, PANEL_TYPES.LIST);++ expect(screen.getByTestId('explorer-create-alert')).toBeDisabled();+ expect(mockPush).not.toHaveBeenCalled();+ });++ it("logs the explorer's own create alert event", async () => {+ const query = stagedQuery(DataSource.TRACES, StringOperators.COUNT);++ await clickCreateAlert(query, DataSource.TRACES, PANEL_TYPES.TIME_SERIES);++ expect(mockedLogEvent).toHaveBeenCalledWith('Traces Explorer: Create alert', {+ sourcepage: DataSource.TRACES,+ panelType: PANEL_TYPES.TIME_SERIES,+ });+ });++ it('one chart per query on metrics: icon only, and the event carries the layout', async () => {+ setPanelType(PANEL_TYPES.TIME_SERIES);+ render(+ <CreateAlertButton+ query={stagedQuery(DataSource.METRICS, StringOperators.COUNT)}+ sourcepage={DataSource.METRICS}+ isOneChartPerQuery+ />,+ );+ const button = screen.getByTestId('explorer-create-alert');+ expect(button).not.toHaveTextContent('Create an alert');++ await userEvent.setup().click(button);++ expect(mockedLogEvent).toHaveBeenCalledWith(+ 'Metrics Explorer: Add to alert clicked',+ {+ sourcepage: DataSource.METRICS,+ panelType: PANEL_TYPES.TIME_SERIES,+ tab: 'explorer',+ oneChartPerQueryEnabled: true,+ },+ );+ });++ describe('logs, the query the page hands over per view', () => {+ const staged = stagedQuery(DataSource.LOGS, StringOperators.NOOP);++ it('list: count aggregation, no order by, filter and pagination as the page sent them', async () => {+ const listRequest = getLogsQueryByPanelType(staged, PANEL_TYPES.LIST, {+ page: 1,+ pageSize: 100,+ filters: { items: [], op: 'AND' },+ filter: { expression: FILTER },+ });+ const exportQuery = getLogsExportQuery(+ listRequest,+ PANEL_TYPES.LIST,+ ) as Query;++ await clickCreateAlert(exportQuery, DataSource.LOGS, PANEL_TYPES.LIST);++ const [queryData] = pushedQuery().builder.queryData;+ expect(queryData.aggregateOperator).toBe(StringOperators.COUNT);+ expect(queryData.orderBy).toStrictEqual([]);+ expect(queryData.groupBy).toStrictEqual([]);+ expect(queryData.filter).toStrictEqual({ expression: FILTER });+ expect(queryData.pageSize).toBe(100);+ });++ it('time series: staged query as is, order by and group by kept', async () => {+ const tsStaged = stagedQuery(DataSource.LOGS, StringOperators.COUNT);+ const exportQuery = getLogsExportQuery(+ tsStaged,+ PANEL_TYPES.TIME_SERIES,+ ) as Query;++ await clickCreateAlert(+ exportQuery,+ DataSource.LOGS,+ PANEL_TYPES.TIME_SERIES,+ );++ const [queryData] = pushedQuery().builder.queryData;+ expect(queryData).toStrictEqual(tsStaged.builder.queryData[0]);+ });++ it('table: staged query as is', async () => {+ const tableStaged = stagedQuery(DataSource.LOGS, StringOperators.COUNT);+ const exportQuery = getLogsExportQuery(+ tableStaged,+ PANEL_TYPES.TABLE,+ ) as Query;++ await clickCreateAlert(exportQuery, DataSource.LOGS, PANEL_TYPES.TABLE);++ expect(pushedQuery().builder).toStrictEqual(tableStaged.builder);+ });+ });++ describe('traces, the query the page hands over per view', () => {+ const staged = stagedQuery(DataSource.TRACES, StringOperators.NOOP);++ it.each([PANEL_TYPES.LIST, PANEL_TYPES.TRACE])(+ '%s: count aggregation, group by cleared by the list shaping, filter kept',+ async (panelType) => {+ const exportQuery = getTracesQueryByPanelType(staged, panelType);++ await clickCreateAlert(exportQuery, DataSource.TRACES, panelType);++ const [queryData] = pushedQuery().builder.queryData;+ expect(queryData.aggregateOperator).toBe(StringOperators.COUNT);+ expect(queryData.groupBy).toStrictEqual([]);+ expect(queryData.filter).toStrictEqual({ expression: FILTER });+ },+ );++ // The list / trace views keep their order in ListView state, and the page+ // shapes the export without it, so the alert never sees an order by.+ it.each([PANEL_TYPES.LIST, PANEL_TYPES.TRACE])(+ '%s: order by is not carried, even when the staged query has one',+ async (panelType) => {+ expect(staged.builder.queryData[0].orderBy).toStrictEqual(ORDER_BY);+ const exportQuery = getTracesQueryByPanelType(staged, panelType);++ await clickCreateAlert(exportQuery, DataSource.TRACES, panelType);++ expect(pushedQuery().builder.queryData[0].orderBy).toStrictEqual([]);+ },+ );++ it.each([PANEL_TYPES.TIME_SERIES, PANEL_TYPES.TABLE])(+ '%s: staged query as is',+ async (panelType) => {+ const aggStaged = stagedQuery(DataSource.TRACES, StringOperators.COUNT);+ const exportQuery = getTracesQueryByPanelType(aggStaged, panelType);++ await clickCreateAlert(exportQuery, DataSource.TRACES, panelType);++ expect(pushedQuery().builder).toStrictEqual(aggStaged.builder);+ },+ );+ });++ it('metrics: the chart query as is', async () => {+ const query = stagedQuery(DataSource.METRICS, StringOperators.COUNT);++ await clickCreateAlert(query, DataSource.METRICS, PANEL_TYPES.TIME_SERIES);++ expect(pushedQuery().builder).toStrictEqual(query.builder);+ });+});diff --git a/frontend/src/container/ExplorerActions/__tests__/utils.test.ts b/frontend/src/container/ExplorerActions/__tests__/utils.test.tsnew file mode 100644index 0000000000..c2c6187cc1--- /dev/null+++ b/frontend/src/container/ExplorerActions/__tests__/utils.test.ts@@ -0,0 +1,144 @@+import { QueryParams } from 'constants/query';+import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';+import ROUTES from 'constants/routes';+import { Query } from 'types/api/queryBuilder/queryBuilderData';+import { StringOperators } from 'types/common/queryBuilder';++import { getCreateAlertLink, getExportPanelType } from '../utils';++function withFirstQuery(+ base: Query,+ overrides: Partial<Query['builder']['queryData'][number]>,+): Query {+ return {+ ...base,+ builder: {+ ...base.builder,+ queryData: [{ ...base.builder.queryData[0], ...overrides }],+ },+ };+}++function decodeQuery(link: string): Query {+ const search = link.split('?')[1];+ const raw = new URLSearchParams(search).get(QueryParams.compositeQuery);+ return JSON.parse(raw as string);+}++describe('getExportPanelType', () => {+ it.each([PANEL_TYPES.TIME_SERIES, PANEL_TYPES.TABLE, PANEL_TYPES.LIST])(+ 'keeps %s',+ (panelType) => {+ expect(getExportPanelType(panelType)).toBe(panelType);+ },+ );++ it.each([PANEL_TYPES.BAR, PANEL_TYPES.PIE, PANEL_TYPES.TRACE, null])(+ 'folds %s to time series',+ (panelType) => {+ expect(getExportPanelType(panelType)).toBe(PANEL_TYPES.TIME_SERIES);+ },+ );+});++describe('getCreateAlertLink', () => {+ const orderBy = [{ columnName: 'timestamp', order: 'desc' }];++ it('points at the new alert route with the query in the url', () => {+ const query = initialQueriesMap.traces;+ const link = getCreateAlertLink({+ query,+ panelType: PANEL_TYPES.TIME_SERIES,+ });++ expect(link.startsWith(`${ROUTES.ALERTS_NEW}?`)).toBe(true);+ expect(decodeQuery(link)).toStrictEqual(query);+ });++ it('logs list: noop becomes count and order by is dropped', () => {+ const query = withFirstQuery(initialQueriesMap.logs, {+ aggregateOperator: StringOperators.NOOP,+ orderBy,+ });++ const [queryData] = decodeQuery(+ getCreateAlertLink({+ query,+ panelType: PANEL_TYPES.LIST,+ }),+ ).builder.queryData;++ expect(queryData.aggregateOperator).toBe(StringOperators.COUNT);+ expect(queryData.orderBy).toStrictEqual([]);+ });++ it('logs time series keeps order by', () => {+ const query = withFirstQuery(initialQueriesMap.logs, {+ aggregateOperator: StringOperators.COUNT,+ orderBy,+ });++ const [queryData] = decodeQuery(+ getCreateAlertLink({+ query,+ panelType: PANEL_TYPES.TIME_SERIES,+ }),+ ).builder.queryData;++ expect(queryData.orderBy).toStrictEqual(orderBy);+ });++ it.each([PANEL_TYPES.LIST, PANEL_TYPES.TRACE])(+ '%s drops order by whatever the source',+ (panelType) => {+ const query = withFirstQuery(initialQueriesMap.traces, {+ aggregateOperator: StringOperators.NOOP,+ orderBy,+ });++ const [queryData] = decodeQuery(getCreateAlertLink({ query, panelType }))+ .builder.queryData;++ expect(queryData.aggregateOperator).toBe(StringOperators.COUNT);+ expect(queryData.orderBy).toStrictEqual([]);+ },+ );++ it('converts a noop on any query, not only the first', () => {+ const first = initialQueriesMap.logs.builder.queryData[0];+ const query: Query = {+ ...initialQueriesMap.logs,+ builder: {+ ...initialQueriesMap.logs.builder,+ queryData: [+ { ...first, aggregateOperator: StringOperators.COUNT },+ { ...first, queryName: 'B', aggregateOperator: StringOperators.NOOP },+ ],+ },+ };++ const operators = decodeQuery(+ getCreateAlertLink({ query, panelType: PANEL_TYPES.TIME_SERIES }),+ ).builder.queryData.map((item) => item.aggregateOperator);++ expect(operators).toStrictEqual([+ StringOperators.COUNT,+ StringOperators.COUNT,+ ]);+ });++ it('does not mutate the query it is given', () => {+ const query = withFirstQuery(initialQueriesMap.logs, {+ aggregateOperator: StringOperators.NOOP,+ orderBy,+ });+ const snapshot = JSON.stringify(query);++ getCreateAlertLink({+ query,+ panelType: PANEL_TYPES.LIST,+ });++ expect(JSON.stringify(query)).toBe(snapshot);+ });+});diff --git a/frontend/src/container/ExplorerActions/utils.ts b/frontend/src/container/ExplorerActions/utils.tsnew file mode 100644index 0000000000..3d92db98d8--- /dev/null+++ b/frontend/src/container/ExplorerActions/utils.ts@@ -0,0 +1,85 @@+import { AVAILABLE_EXPORT_PANEL_TYPES } from 'constants/panelTypes';+import { QueryParams } from 'constants/query';+import { PANEL_TYPES } from 'constants/queryBuilder';+import ROUTES from 'constants/routes';+import {+ MetricsExplorerEventKeys,+ MetricsExplorerEvents,+} from 'container/MetricsExplorer/events';+import { cloneDeep } from 'lodash-es';+import { Query } from 'types/api/queryBuilder/queryBuilderData';+import { DataSource, StringOperators } from 'types/common/queryBuilder';++export const EXPLORER_ACTION_EVENTS: Record<+ DataSource,+ { createAlert: string; addToDashboard: string; exported: string }+> = {+ [DataSource.LOGS]: {+ createAlert: 'Logs Explorer: Create alert',+ addToDashboard: 'Logs Explorer: Add to dashboard clicked',+ exported: 'Logs Explorer: Add to dashboard successful',+ },+ [DataSource.TRACES]: {+ createAlert: 'Traces Explorer: Create alert',+ addToDashboard: 'Traces Explorer: Add to dashboard clicked',+ exported: 'Traces Explorer: Add to dashboard successful',+ },+ [DataSource.METRICS]: {+ createAlert: MetricsExplorerEvents.AddToAlertClicked,+ addToDashboard: MetricsExplorerEvents.AddToDashboardClicked,+ exported: MetricsExplorerEvents.AddToDashboardSuccessful,+ },+};++export function getExplorerActionEventPayload({+ sourcepage,+ panelType,+ isOneChartPerQuery,+}: {+ sourcepage: DataSource;+ panelType: PANEL_TYPES | null;+ isOneChartPerQuery: boolean;+}): Record<string, unknown> {+ if (sourcepage !== DataSource.METRICS) {+ return { sourcepage, panelType };+ }+ return {+ sourcepage,+ panelType,+ [MetricsExplorerEventKeys.Tab]: 'explorer',+ [MetricsExplorerEventKeys.OneChartPerQueryEnabled]: isOneChartPerQuery,+ };+}++export function getExportPanelType(panelType: PANEL_TYPES | null): PANEL_TYPES {+ return panelType && AVAILABLE_EXPORT_PANEL_TYPES.includes(panelType)+ ? panelType+ : PANEL_TYPES.TIME_SERIES;+}++// Alerts need an aggregation, and list style views carry an order the alert+// cannot use.+export function getCreateAlertLink({+ query,+ panelType,+}: {+ query: Query;+ panelType: PANEL_TYPES | null;+}): string {+ const isListStyle =+ panelType === PANEL_TYPES.LIST || panelType === PANEL_TYPES.TRACE;++ const alertQuery = cloneDeep(query);+ alertQuery.builder.queryData = alertQuery.builder.queryData.map((item) => ({+ ...item,+ aggregateOperator:+ item.aggregateOperator === StringOperators.NOOP+ ? StringOperators.COUNT+ : item.aggregateOperator,+ orderBy: isListStyle ? [] : item.orderBy,+ }));++ return `${ROUTES.ALERTS_NEW}?${QueryParams.compositeQuery}=${encodeURIComponent(+ JSON.stringify(alertQuery),+ )}`;+}diff --git a/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx b/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsxindex f82fdd8aea..83c9235927 100644--- a/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx+++ b/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx@@ -1,4 +1,4 @@-import { useState } from 'react';+import { ReactNode, useState } from 'react';import { Switch } from '@signozhq/ui/switch';import { Typography } from '@signozhq/ui/typography';import DownloadOptionsMenu from 'components/DownloadOptionsMenu/DownloadOptionsMenu';@@ -6,7 +6,6 @@ import FieldsSelector from 'components/FieldsSelector';import LogsFormatOptionsMenu from 'components/LogsFormatOptionsMenu/LogsFormatOptionsMenu';import ListViewOrderBy from 'components/OrderBy/ListViewOrderBy';import { LOCALSTORAGE } from 'constants/localStorage';-import { PANEL_TYPES } from 'constants/queryBuilder';import { useOptionsMenu } from 'container/OptionsMenu';import { LOGS_REQUIRED_COLUMNS } from 'container/OptionsMenu/constants';import { ArrowUp10, Minus } from '@signozhq/icons';@@ -14,18 +13,18 @@ import { DataSource, StringOperators } from 'types/common/queryBuilder';function LogsActionsContainer({listQuery,- selectedPanelType,showFrequencyChart,handleToggleFrequencyChart,orderBy,setOrderBy,+ explorerActions,}: {listQuery: any;- selectedPanelType: PANEL_TYPES;showFrequencyChart: boolean;handleToggleFrequencyChart: () => void;orderBy: string;setOrderBy: (value: string) => void;+ explorerActions: ReactNode;}): JSX.Element {const { options, config } = useOptionsMenu({storageKey: LOCALSTORAGE.LOGS_LIST_OPTIONS,@@ -60,48 +59,43 @@ function LogsActionsContainer({<div className="logs-actions-container"><div className="tab-options"><div className="tab-options-left">- {selectedPanelType === PANEL_TYPES.LIST && (- <div className="frequency-chart-view-controller">- <Typography>Frequency chart</Typography>- <Switch- value={showFrequencyChart}- defaultValue- onChange={handleToggleFrequencyChart}- />- </div>- )}+ <div className="frequency-chart-view-controller">+ <Typography>Frequency chart</Typography>+ <Switch+ value={showFrequencyChart}+ defaultValue+ onChange={handleToggleFrequencyChart}+ />+ </div></div><div className="tab-options-right">- {selectedPanelType === PANEL_TYPES.LIST && (- <>- <div className="order-by-container">- <div className="order-by-label">- Order by <Minus size={14} /> <ArrowUp10 size={14} />- </div>+ {explorerActions}+ <div className="order-by-container">+ <div className="order-by-label">+ Order by <Minus size={14} /> <ArrowUp10 size={14} />+ </div>- <ListViewOrderBy- value={orderBy}- onChange={(value): void => setOrderBy(value)}- dataSource={DataSource.LOGS}- />- </div>- <div className="download-options-container">- <DownloadOptionsMenu- dataSource={DataSource.LOGS}- selectedColumns={options?.selectColumns}- />- </div>- <div className="format-options-container">- <LogsFormatOptionsMenu- items={formatItems}- selectedOptionFormat={options.format}- config={config}- onOpenColumns={(): void => setIsFieldsSelectorOpen(true)}- />- </div>- </>- )}+ <ListViewOrderBy+ value={orderBy}+ onChange={(value): void => setOrderBy(value)}+ dataSource={DataSource.LOGS}+ />+ </div>+ <div className="download-options-container">+ <DownloadOptionsMenu+ dataSource={DataSource.LOGS}+ selectedColumns={options?.selectColumns}+ />+ </div>+ <div className="format-options-container">+ <LogsFormatOptionsMenu+ items={formatItems}+ selectedOptionFormat={options.format}+ config={config}+ onOpenColumns={(): void => setIsFieldsSelectorOpen(true)}+ />+ </div></div></div>{config.fieldsSelector && (diff --git a/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scss b/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scssindex b0a3347b6c..708abe30b9 100644--- a/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scss+++ b/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scss@@ -187,6 +187,7 @@display: flex;justify-content: flex-end;align-items: center;+ gap: 8px;padding: 12px;flex-shrink: 0;}diff --git a/frontend/src/container/LogsExplorerViews/index.tsx b/frontend/src/container/LogsExplorerViews/index.tsxindex 00d7ef216d..f9a96bafa1 100644--- a/frontend/src/container/LogsExplorerViews/index.tsx+++ b/frontend/src/container/LogsExplorerViews/index.tsx@@ -37,6 +37,7 @@ import {getListQuery,getQueryByPanelType,} from 'container/LogsExplorerViews/explorerUtils';+import ExplorerActions from 'container/ExplorerActions/ExplorerActions';import TimeSeriesView from 'container/TimeSeriesView/TimeSeriesView';import { ExportDashboard } from 'hooks/dashboard/useExportDashboards';import { useGetExportToDashboardLink } from 'hooks/dashboard/useGetExportToDashboardLink';@@ -140,6 +141,13 @@ function LogsExplorerViewsContainer({[selectedPanelType, requestData],);+ const explorerActions = useMemo(+ () => (+ <ExplorerActions query={exportDefaultQuery} sourcepage={DataSource.LOGS} />+ ),+ [exportDefaultQuery],+ );+const {data: listChartData,isFetching: isFetchingListChartData,@@ -416,14 +424,14 @@ function LogsExplorerViewsContainer({return (<div className="logs-explorer-views-container"><div className="logs-explorer-views-types">- {!showLiveLogs && (+ {!showLiveLogs && selectedPanelType === PANEL_TYPES.LIST && (<LogsActionsContainerlistQuery={listQuery}- selectedPanelType={selectedPanelType}showFrequencyChart={showFrequencyChart}handleToggleFrequencyChart={handleToggleFrequencyChart}orderBy={orderBy}setOrderBy={setOrderBy}+ explorerActions={explorerActions}/>)}@@ -474,21 +482,23 @@ function LogsExplorerViewsContainer({dataSource={DataSource.LOGS}setWarning={setWarning}allowExport+ headerActions={explorerActions}/></div>)}{selectedPanelType === PANEL_TYPES.TABLE && !showLiveLogs && (<div className="table-view-container">- {data && !isError && (- <div className="table-view-container-header">+ <div className="table-view-container-header">+ {explorerActions}+ {data && !isError && (<ExportMenudataSource={DataSource.LOGS}data={data}query={stagedQuery || initialQueriesMap.metrics}fileName="logs-table"/>- </div>- )}+ )}+ </div><LogsExplorerTabledata={(data?.payload?.data?.newResult?.data?.result ||diff --git a/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx b/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsxindex 86757215c6..db53ad4016 100644--- a/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx+++ b/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx@@ -394,6 +394,7 @@ function Explorer(): JSX.Element {setYAxisUnit={setYAxisUnit}showYAxisUnitSelector={showYAxisUnitSelector}isCancelled={isCancelled}+ exportDefaultQuery={exportDefaultQuery}/></div></div>diff --git a/frontend/src/container/MetricsExplorer/Explorer/TimeSeries.tsx b/frontend/src/container/MetricsExplorer/Explorer/TimeSeries.tsxindex a1c57a1378..125a1dab79 100644--- a/frontend/src/container/MetricsExplorer/Explorer/TimeSeries.tsx+++ b/frontend/src/container/MetricsExplorer/Explorer/TimeSeries.tsx@@ -19,6 +19,7 @@ import { ENTITY_VERSION_V5 } from 'constants/app';import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';import { MAX_QUERY_RETRIES } from 'constants/reactQuery';import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';+import ExplorerActions from 'container/ExplorerActions/ExplorerActions';import TimeSeriesView from 'container/TimeSeriesView/TimeSeriesView';import { convertDataValueToMs } from 'container/TimeSeriesView/utils';import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';@@ -51,6 +52,7 @@ function TimeSeries({showYAxisUnitSelector,metrics,isCancelled = false,+ exportDefaultQuery,}: TimeSeriesProps): JSX.Element {const { stagedQuery, currentQuery } = useQueryBuilder();@@ -272,6 +274,9 @@ function TimeSeries({metricName;const currentYAxisUnit = yAxisUnit || metricUnit;+ const exportQuery = changeLayoutForOneChartPerQuery+ ? queryPayloads[index]+ : exportDefaultQuery;return (<div@@ -312,6 +317,14 @@ function TimeSeries({error={queries[index].error as APIError}setWarning={setWarning}allowExport+ headerActions={+ <ExplorerActions+ query={stagedQuery ? exportQuery : null}+ sourcepage={DataSource.METRICS}+ panelType={PANEL_TYPES.TIME_SERIES}+ isOneChartPerQuery={changeLayoutForOneChartPerQuery}+ />+ }/></div>);diff --git a/frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsx b/frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsxindex 72aaefe0d9..5065de9faa 100644--- a/frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsx+++ b/frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsx@@ -4,6 +4,7 @@ import { Provider } from 'react-redux';import { MemoryRouter } from 'react-router-dom';import { useSearchParams } from 'react-router-dom-v5-compat';import { render, screen } from '@testing-library/react';+import { TooltipProvider } from '@signozhq/ui/tooltip';import {MetrictypesTemporalityDTO,MetrictypesTypeDTO,@@ -146,9 +147,11 @@ function renderExplorer(): void {<QueryClientProvider client={queryClient}><MemoryRouter><Provider store={store}>- <ErrorModalProvider>- <Explorer />- </ErrorModalProvider>+ <TooltipProvider>+ <ErrorModalProvider>+ <Explorer />+ </ErrorModalProvider>+ </TooltipProvider></Provider></MemoryRouter></QueryClientProvider>,diff --git a/frontend/src/container/MetricsExplorer/Explorer/__tests__/TimeSeries.test.tsx b/frontend/src/container/MetricsExplorer/Explorer/__tests__/TimeSeries.test.tsxindex 5a1f59768f..454bf1c25d 100644--- a/frontend/src/container/MetricsExplorer/Explorer/__tests__/TimeSeries.test.tsx+++ b/frontend/src/container/MetricsExplorer/Explorer/__tests__/TimeSeries.test.tsx@@ -1,6 +1,7 @@import { render, screen } from '@testing-library/react';import userEvent from '@testing-library/user-event';import * as metricsExplorerHooks from 'api/generated/services/metrics';+import { initialQueriesMap } from 'constants/queryBuilder';import TimeSeries from '../TimeSeries';import { TimeSeriesProps } from '../types';@@ -71,6 +72,7 @@ function renderTimeSeries(yAxisUnit="count"setYAxisUnit={mockSetYAxisUnit}showYAxisUnitSelector={false}+ exportDefaultQuery={initialQueriesMap.metrics}{...overrides}/>,);diff --git a/frontend/src/container/MetricsExplorer/Explorer/types.ts b/frontend/src/container/MetricsExplorer/Explorer/types.tsindex 8ffa4aca26..4ca5b493f6 100644--- a/frontend/src/container/MetricsExplorer/Explorer/types.ts+++ b/frontend/src/container/MetricsExplorer/Explorer/types.ts@@ -1,6 +1,7 @@import { Dispatch, SetStateAction } from 'react';import { MetricsexplorertypesMetricMetadataDTO } from 'api/generated/services/sigNoz.schemas';import { Warning } from 'types/api';+import { Query } from 'types/api/queryBuilder/queryBuilderData';export interface TimeSeriesProps {onFetchingStateChange?: (isFetching: boolean) => void;@@ -17,4 +18,5 @@ export interface TimeSeriesProps {setYAxisUnit: (unit: string) => void;showYAxisUnitSelector: boolean;isCancelled?: boolean;+ exportDefaultQuery: Query;}diff --git a/frontend/src/container/MetricsExplorer/events.ts b/frontend/src/container/MetricsExplorer/events.tsindex d3341931a8..c166a9bdb8 100644--- a/frontend/src/container/MetricsExplorer/events.ts+++ b/frontend/src/container/MetricsExplorer/events.ts@@ -19,6 +19,7 @@ export enum MetricsExplorerEvents {YAxisUnitApplied = 'Metrics Explorer: Y axis unit applied',AddToAlertClicked = 'Metrics Explorer: Add to alert clicked',AddToDashboardClicked = 'Metrics Explorer: Add to dashboard clicked',+ AddToDashboardSuccessful = 'Metrics Explorer: Add to dashboard successful',SaveViewClicked = 'Metrics Explorer: Save view clicked',SearchApplied = 'Metrics Explorer: Search applied',ViewEdited = 'Metrics Explorer: View edited',diff --git a/frontend/src/container/TimeSeriesView/TimeSeriesView.module.scss b/frontend/src/container/TimeSeriesView/TimeSeriesView.module.scssnew file mode 100644index 0000000000..9eea7ad306--- /dev/null+++ b/frontend/src/container/TimeSeriesView/TimeSeriesView.module.scss@@ -0,0 +1,25 @@+.timeSeriesView {+ height: 50vh;+ min-height: 350px;+ padding: 0px 12px;++ :global(.ant-card-body) {+ height: 50vh;+ min-height: 350px;+ padding: 0px 12px;+ }+}++.header {+ display: flex;+ justify-content: space-between;+ align-items: center;+ padding: 12px 0;+ flex-shrink: 0;+}++.headerActions {+ display: flex;+ align-items: center;+ gap: 8px;+}diff --git a/frontend/src/container/TimeSeriesView/TimeSeriesView.styles.scss b/frontend/src/container/TimeSeriesView/TimeSeriesView.styles.scssdeleted file mode 100644index c7cb592384..0000000000--- a/frontend/src/container/TimeSeriesView/TimeSeriesView.styles.scss+++ /dev/null@@ -1,19 +0,0 @@-.time-series-view {- height: 50vh;- min-height: 350px;- padding: 0px 12px;-- &__header {- display: flex;- justify-content: space-between;- align-items: center;- padding: 12px 0;- flex-shrink: 0;- }-- .ant-card-body {- height: 50vh;- min-height: 350px;- padding: 0px 12px;- }-}diff --git a/frontend/src/container/TimeSeriesView/TimeSeriesView.tsx b/frontend/src/container/TimeSeriesView/TimeSeriesView.tsxindex 5628cb3c61..3b096c3d9a 100644--- a/frontend/src/container/TimeSeriesView/TimeSeriesView.tsx+++ b/frontend/src/container/TimeSeriesView/TimeSeriesView.tsx@@ -1,5 +1,6 @@import {Dispatch,+ ReactNode,SetStateAction,useCallback,useEffect,@@ -10,6 +11,7 @@ import {// eslint-disable-next-line no-restricted-importsimport { useDispatch, useSelector } from 'react-redux';import { useLocation } from 'react-router-dom';+import cx from 'classnames';import logEvent from 'api/common/logEvent';import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';import Uplot from 'components/Uplot';@@ -50,7 +52,7 @@ import { getTimeRange } from 'utils/getTimeRange';import ExportMenu from 'components/ExportMenu/ExportMenu';-import './TimeSeriesView.styles.scss';+import styles from './TimeSeriesView.module.scss';function TimeSeriesView({data,@@ -66,6 +68,7 @@ function TimeSeriesView({allowExport = false,exportFileName,onYAxisUnitChange,+ headerActions,}: TimeSeriesViewProps): JSX.Element {const graphRef = useRef<HTMLDivElement>(null);@@ -252,28 +255,31 @@ function TimeSeriesView({);const showExport = allowExport && !!data?.rawV5Response;- const showHeader = showExport || !!onYAxisUnitChange;+ const showHeader = showExport || !!onYAxisUnitChange || !!headerActions;return (- <div className="time-series-view">+ <div className={cx('time-series-view', styles.timeSeriesView)}>{isError && error && <ErrorInPlace error={error as APIError} />}{showHeader && (- <div className="time-series-view__header">+ <div className={styles.header} data-testid="time-series-view-header"><div>{onYAxisUnitChange && (<BuilderUnitsFilter onChange={onYAxisUnitChange} yAxisUnit={yAxisUnit} />)}</div>- {showExport && data?.rawV5Response && (- <ExportMenu- dataSource={dataSource}- yAxisUnit={yAxisUnit}- data={data}- query={currentQuery}- fileName={exportFileName ?? `${dataSource}-timeseries`}- />- )}+ <div className={styles.headerActions}>+ {headerActions}+ {showExport && data?.rawV5Response && (+ <ExportMenu+ dataSource={dataSource}+ yAxisUnit={yAxisUnit}+ data={data}+ query={currentQuery}+ fileName={exportFileName ?? `${dataSource}-timeseries`}+ />+ )}+ </div></div>)}@@ -344,6 +350,8 @@ interface TimeSeriesViewProps {// Opt-in: render the y-axis unit selector in the header (views without their// own selector, e.g. Logs). Metrics keeps its separate YAxisUnitSelector.onYAxisUnitChange?: (value: string) => void;+ // Rendered in the header ahead of the export menu.+ headerActions?: ReactNode;}TimeSeriesView.defaultProps = {diff --git a/frontend/src/container/TimeSeriesView/__tests__/TimeSeriesView.test.tsx b/frontend/src/container/TimeSeriesView/__tests__/TimeSeriesView.test.tsxindex 0aca14fe81..2ed5059449 100644--- a/frontend/src/container/TimeSeriesView/__tests__/TimeSeriesView.test.tsx+++ b/frontend/src/container/TimeSeriesView/__tests__/TimeSeriesView.test.tsx@@ -131,7 +131,7 @@ describe('TimeSeriesView header gating', () => {});it('renders no header row when neither export nor unit selector is enabled', () => {- const { container } = renderView({ withRawV5: false });- expect(container.querySelector('.time-series-view__header')).toBeNull();+ const { queryByTestId } = renderView({ withRawV5: false });+ expect(queryByTestId('time-series-view-header')).toBeNull();});});diff --git a/frontend/src/container/TracesExplorer/ListView/index.tsx b/frontend/src/container/TracesExplorer/ListView/index.tsxindex ada647cf20..9416ae2eae 100644--- a/frontend/src/container/TracesExplorer/ListView/index.tsx+++ b/frontend/src/container/TracesExplorer/ListView/index.tsx@@ -2,6 +2,7 @@ import {Dispatch,memo,MutableRefObject,+ ReactNode,SetStateAction,useCallback,useEffect,@@ -55,6 +56,7 @@ interface ListViewProps {setWarning: Dispatch<SetStateAction<Warning | undefined>>;setIsLoadingQueries: Dispatch<SetStateAction<boolean>>;queryKeyRef?: MutableRefObject<any>;+ headerActions?: ReactNode;}function ListView({@@ -62,6 +64,7 @@ function ListView({setWarning,setIsLoadingQueries,queryKeyRef,+ headerActions,}: ListViewProps): JSX.Element {const { stagedQuery, panelType: panelTypeFromQueryBuilder } =useQueryBuilder();@@ -227,6 +230,7 @@ function ListView({return (<div className={styles.container}><div className="trace-explorer-controls">+ {headerActions}<div className="order-by-container"><div className="order-by-label">Order by <Minus size={14} /> <ArrowUp10 size={14} />@@ -272,6 +276,7 @@ function ListView({ListView.defaultProps = {queryKeyRef: undefined,+ headerActions: undefined,};export default memo(ListView);diff --git a/frontend/src/container/TracesExplorer/TableView/TableView.styles.scss b/frontend/src/container/TracesExplorer/TableView/TableView.styles.scssindex 4de2f92d12..f8677389fd 100644--- a/frontend/src/container/TracesExplorer/TableView/TableView.styles.scss+++ b/frontend/src/container/TracesExplorer/TableView/TableView.styles.scss@@ -2,6 +2,7 @@display: flex;justify-content: flex-end;align-items: center;+ gap: 8px;padding: 12px;flex-shrink: 0;}diff --git a/frontend/src/container/TracesExplorer/TableView/index.tsx b/frontend/src/container/TracesExplorer/TableView/index.tsxindex 7e049d8e0a..24b6ca12fb 100644--- a/frontend/src/container/TracesExplorer/TableView/index.tsx+++ b/frontend/src/container/TracesExplorer/TableView/index.tsx@@ -2,6 +2,7 @@ import {Dispatch,memo,MutableRefObject,+ ReactNode,SetStateAction,useEffect,useMemo,@@ -30,10 +31,12 @@ function TableView({setWarning,setIsLoadingQueries,queryKeyRef,+ headerActions,}: {setWarning: Dispatch<SetStateAction<Warning | undefined>>;setIsLoadingQueries: Dispatch<SetStateAction<boolean>>;queryKeyRef?: MutableRefObject<any>;+ headerActions?: ReactNode;}): JSX.Element {const { stagedQuery, panelType } = useQueryBuilder();@@ -101,14 +104,17 @@ function TableView({return (<Space.Compact block direction="vertical">{isError && error && <ErrorInPlace error={error as APIError} />}- {!isError && data && (+ {!isError && (<div className="traces-table-view-header">- <ExportMenu- dataSource={DataSource.TRACES}- data={data}- query={stagedQuery || initialQueriesMap.traces}- fileName="traces-table"- />+ {headerActions}+ {data && (+ <ExportMenu+ dataSource={DataSource.TRACES}+ data={data}+ query={stagedQuery || initialQueriesMap.traces}+ fileName="traces-table"+ />+ )}</div>)}{!isError && (@@ -125,6 +131,7 @@ function TableView({TableView.defaultProps = {queryKeyRef: undefined,+ headerActions: undefined,};export default memo(TableView);diff --git a/frontend/src/container/TracesExplorer/TracesView/index.tsx b/frontend/src/container/TracesExplorer/TracesView/index.tsxindex 8c595b6c18..e32dcbdff0 100644--- a/frontend/src/container/TracesExplorer/TracesView/index.tsx+++ b/frontend/src/container/TracesExplorer/TracesView/index.tsx@@ -2,6 +2,7 @@ import {Dispatch,memo,MutableRefObject,+ ReactNode,SetStateAction,useEffect,useMemo,@@ -40,6 +41,7 @@ interface TracesViewProps {setWarning: Dispatch<SetStateAction<Warning | undefined>>;setIsLoadingQueries: Dispatch<SetStateAction<boolean>>;queryKeyRef?: MutableRefObject<any>;+ headerActions?: ReactNode;}function TracesView({@@ -47,6 +49,7 @@ function TracesView({setWarning,setIsLoadingQueries,queryKeyRef,+ headerActions,}: TracesViewProps): JSX.Element {const { stagedQuery, panelType } = useQueryBuilder();@@ -155,6 +158,7 @@ function TracesView({</Typography><div className="trace-explorer-controls">+ {headerActions}<DownloadOptionsMenudataSource={DataSource.TRACES}panelType={PANEL_TYPES.TRACE}@@ -187,6 +191,7 @@ function TracesView({TracesView.defaultProps = {queryKeyRef: undefined,+ headerActions: undefined,};export default memo(TracesView);diff --git a/frontend/src/pages/TracesExplorer/TimeSeriesView/index.tsx b/frontend/src/pages/TracesExplorer/TimeSeriesView/index.tsxindex 4f200cc94f..d1e7a9c8c2 100644--- a/frontend/src/pages/TracesExplorer/TimeSeriesView/index.tsx+++ b/frontend/src/pages/TracesExplorer/TimeSeriesView/index.tsx@@ -1,6 +1,7 @@import {Dispatch,MutableRefObject,+ ReactNode,SetStateAction,useEffect,useMemo,@@ -29,6 +30,7 @@ function TimeSeriesViewContainer({setWarning,setIsLoadingQueries,queryKeyRef,+ headerActions,}: TimeSeriesViewProps): JSX.Element {const { stagedQuery, currentQuery, panelType } = useQueryBuilder();@@ -126,6 +128,7 @@ function TimeSeriesViewContainer({dataSource={dataSource}setWarning={setWarning}allowExport+ headerActions={headerActions}/></div>);@@ -137,11 +140,13 @@ interface TimeSeriesViewProps {setWarning: Dispatch<SetStateAction<Warning | undefined>>;setIsLoadingQueries: Dispatch<SetStateAction<boolean>>;queryKeyRef?: MutableRefObject<any>;+ headerActions?: ReactNode;}TimeSeriesViewContainer.defaultProps = {dataSource: DataSource.TRACES,queryKeyRef: undefined,+ headerActions: undefined,};export default TimeSeriesViewContainer;diff --git a/frontend/src/pages/TracesExplorer/index.tsx b/frontend/src/pages/TracesExplorer/index.tsxindex a0ad27d19c..406ded8208 100644--- a/frontend/src/pages/TracesExplorer/index.tsx+++ b/frontend/src/pages/TracesExplorer/index.tsx@@ -13,6 +13,8 @@ import { LOCALSTORAGE } from 'constants/localStorage';import { AVAILABLE_EXPORT_PANEL_TYPES } from 'constants/panelTypes';import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';import { usePageActions } from 'container/AIAssistant/pageActions/usePageActions';+import ExplorerActions from 'container/ExplorerActions/ExplorerActions';+import { getExportPanelType } from 'container/ExplorerActions/utils';import ExplorerOptionWrapper from 'container/ExplorerOptions/ExplorerOptionWrapper';import { useOptionsMenu } from 'container/OptionsMenu';import LeftToolbarActions from 'container/QueryBuilder/components/ToolbarActions/LeftToolbarActions';@@ -194,6 +196,27 @@ function TracesExplorer(): JSX.Element {[stagedQuery, panelType],);+ const exportDashboardQuery = useMemo(+ () =>+ getExportQueryData(+ exportDefaultQuery,+ getExportPanelType(panelType),+ options,+ ),+ [exportDefaultQuery, panelType, options],+ );++ const explorerActions = useMemo(+ () => (+ <ExplorerActions+ query={stagedQuery ? exportDefaultQuery : null}+ dashboardQuery={stagedQuery ? exportDashboardQuery : null}+ sourcepage={DataSource.TRACES}+ />+ ),+ [stagedQuery, exportDefaultQuery, exportDashboardQuery],+ );+const handleExport = useCallback((dashboard: ExportDashboard | null, isNewDashboard?: boolean): void => {if (!dashboard || !panelType) {@@ -318,6 +341,7 @@ function TracesExplorer(): JSX.Element {setWarning={setWarning}setIsLoadingQueries={setIsLoadingQueries}queryKeyRef={listQueryKeyRef}+ headerActions={explorerActions}/></div>)}@@ -329,6 +353,7 @@ function TracesExplorer(): JSX.Element {setWarning={setWarning}setIsLoadingQueries={setIsLoadingQueries}queryKeyRef={listQueryKeyRef}+ headerActions={explorerActions}/></div>)}@@ -341,6 +366,7 @@ function TracesExplorer(): JSX.Element {setWarning={setWarning}setIsLoadingQueries={setIsLoadingQueries}queryKeyRef={listQueryKeyRef}+ headerActions={explorerActions}/></div>)}@@ -351,6 +377,7 @@ function TracesExplorer(): JSX.Element {setWarning={setWarning}setIsLoadingQueries={setIsLoadingQueries}queryKeyRef={listQueryKeyRef}+ headerActions={explorerActions}/></div>)}