Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build:clickhouse": "NEXT_PUBLIC_IS_LOCAL_MODE=true NEXT_PUBLIC_CLICKHOUSE_BUILD=true next build --webpack && node scripts/prepare-clickhouse-build-export.js",
"run:clickhouse": "test -d out && npx rimraf tmp && mkdir tmp && cp -r out tmp/clickstack && echo 'visit http://localhost:3000/clickstack to start' && npx serve tmp -l 3000 || echo 'run build:clickhouse first'",
"start": "next start",
"lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 372 && yarn run -T oxfmt --check '**/*.{ts,tsx,css,scss}'",
"lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 199 && yarn run -T oxfmt --check '**/*.{ts,tsx,css,scss}'",
"lint:fix": "yarn run -T oxlint --fix && yarn run -T oxfmt '**/*.{ts,tsx,css,scss}'",
"lint:styles": "stylelint **/*/*.{css,scss}",
"ci:lint": "yarn lint && yarn tsc --noEmit && yarn lint:styles --quiet",
Expand Down
78 changes: 43 additions & 35 deletions packages/app/src/__tests__/ChartUtils.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { DEFAULT_PROMQL_REDUCER } from '@hyperdx/common-utils/dist/core/promql';
import { isBuilderChartConfig } from '@hyperdx/common-utils/dist/guards';
import {
BuilderChartConfigWithDateRange,
DisplayType,
PromqlReducer,
SourceKind,
TSource,
} from '@hyperdx/common-utils/dist/types';
import { fromAny, fromPartial } from '@total-typescript/shoehorn';

import {
ChartKeyJoiner,
Expand Down Expand Up @@ -421,10 +423,10 @@ describe('ChartUtils', () => {
],
};

const source = {
const source = fromPartial<TSource>({
kind: SourceKind.Log,
severityTextExpression: 'SeverityText',
} as TSource;
});

const actual = formatResponseForTimeChart({
currentPeriodResponse: res,
Expand Down Expand Up @@ -1339,13 +1341,13 @@ describe('ChartUtils', () => {

describe('convertToTimeChartConfig', () => {
it('should set granularity when granularity is auto', () => {
const config = {
const config = fromPartial<BuilderChartConfigWithDateRange>({
granularity: 'auto',
dateRange: [
new Date('2025-11-26T00:00:00Z'),
new Date('2025-11-27T00:00:00Z'),
],
} as BuilderChartConfigWithDateRange;
});

const granularityFromFunction =
convertToTimeChartConfig(config).granularity;
Expand All @@ -1354,12 +1356,12 @@ describe('ChartUtils', () => {
});

it('should set granularity when granularity is undefined', () => {
const config = {
const config = fromPartial<BuilderChartConfigWithDateRange>({
dateRange: [
new Date('2025-11-26T00:00:00Z'),
new Date('2025-11-27T00:00:00Z'),
],
} as BuilderChartConfigWithDateRange;
});

const granularityFromFunction =
convertToTimeChartConfig(config).granularity;
Expand All @@ -1368,13 +1370,13 @@ describe('ChartUtils', () => {
});

it('should retain the specified granularity when not auto', () => {
const config = {
const config = fromPartial<BuilderChartConfigWithDateRange>({
granularity: '5 minute',
dateRange: [
new Date('2025-11-26T00:00:00Z'),
new Date('2025-11-27T00:00:00Z'),
],
} as BuilderChartConfigWithDateRange;
});

const granularityFromFunction =
convertToTimeChartConfig(config).granularity;
Expand All @@ -1385,17 +1387,22 @@ describe('ChartUtils', () => {
// seriesLimit lives on the builder member of the ChartConfigWithDateRange
// union, so narrow the result before reading it. The per-tile value is
// read from the config itself (no team override anymore).
const seriesLimitOf = (seriesLimit?: number | null) =>
(
convertToTimeChartConfig({
const seriesLimitOf = (seriesLimit?: number | null) => {
const result = convertToTimeChartConfig(
fromPartial<BuilderChartConfigWithDateRange>({
granularity: '5 minute',
dateRange: [
new Date('2025-11-26T00:00:00Z'),
new Date('2025-11-27T00:00:00Z'),
],
...(seriesLimit !== undefined ? { seriesLimit } : {}),
} as BuilderChartConfigWithDateRange) as BuilderChartConfigWithDateRange
).seriesLimit;
}),
);
if (!isBuilderChartConfig(result)) {
throw new Error('Expected builder chart config');
}
return result.seriesLimit;
};

it('omits seriesLimit (capping disabled) when the tile has no limit', () => {
expect(seriesLimitOf()).toBeUndefined();
Expand All @@ -1416,14 +1423,14 @@ describe('ChartUtils', () => {

describe('convertToNumberChartConfig', () => {
it('should remove granularity and groupBy from the config', () => {
const config = {
const config = fromPartial<BuilderChartConfigWithDateRange>({
granularity: '5 minute',
groupBy: 'ServiceName',
dateRange: [
new Date('2025-11-26T00:00:00Z'),
new Date('2025-11-27T00:00:00Z'),
],
} as BuilderChartConfigWithDateRange;
});

const convertedConfig = convertToNumberChartConfig(config);

Expand Down Expand Up @@ -1619,41 +1626,41 @@ describe('ChartUtils', () => {

describe('convertToTableChartConfig', () => {
it('should remove granularity from the config', () => {
const config = {
const config = fromPartial<BuilderChartConfigWithDateRange>({
granularity: '5 minute',
dateRange: [
new Date('2025-11-26T00:00:00Z'),
new Date('2025-11-27T00:00:00Z'),
],
} as BuilderChartConfigWithDateRange;
});

const convertedConfig = convertToTableChartConfig(config);

expect(convertedConfig.granularity).toBeUndefined();
});

it('should apply a default sort if none is provided', () => {
const config = {
const config = fromPartial<BuilderChartConfigWithDateRange>({
groupBy: 'ServiceName',
dateRange: [
new Date('2025-11-26T00:00:00Z'),
new Date('2025-11-27T00:00:00Z'),
],
} as BuilderChartConfigWithDateRange;
});

const convertedConfig = convertToTableChartConfig(config);

expect(convertedConfig.orderBy).toEqual('ServiceName');
});

it('should apply a default limit if none is provided', () => {
const config = {
const config = fromPartial<BuilderChartConfigWithDateRange>({
groupBy: 'ServiceName',
dateRange: [
new Date('2025-11-26T00:00:00Z'),
new Date('2025-11-27T00:00:00Z'),
],
} as BuilderChartConfigWithDateRange;
});

const convertedConfig = convertToTableChartConfig(config);

Expand All @@ -1679,7 +1686,7 @@ describe('ChartUtils', () => {
it('throws when meta is missing', () => {
expect(() =>
formatResponseForCategoricalChart(
{ data: [{ 'count()': 10 }] } as any,
fromAny({ data: [{ 'count()': 10 }] }),
getColor,
),
).toThrow('No meta data found in response');
Expand Down Expand Up @@ -2116,19 +2123,20 @@ describe('getSelectSeriesColors', () => {
});

describe('convertV1ChartConfigToV2', () => {
const metricSource = {
id: 'metric-source',
kind: SourceKind.Metric,
connection: 'connection-id',
from: { databaseName: 'default', tableName: '' },
timestampValueExpression: 'TimeUnix',
resourceAttributesExpression: 'ResourceAttributes',
metricTables: {
gauge: 'otel_metrics_gauge',
histogram: 'otel_metrics_histogram',
sum: 'otel_metrics_sum',
},
} as unknown as Parameters<typeof convertV1ChartConfigToV2>[1]['metric'];
const metricSource: Parameters<typeof convertV1ChartConfigToV2>[1]['metric'] =
fromPartial({
id: 'metric-source',
kind: SourceKind.Metric,
connection: 'connection-id',
from: { databaseName: 'default', tableName: '' },
timestampValueExpression: 'TimeUnix',
resourceAttributesExpression: 'ResourceAttributes',
metricTables: {
gauge: 'otel_metrics_gauge',
histogram: 'otel_metrics_histogram',
sum: 'otel_metrics_sum',
},
});

const convertMetricSeries = (aggFn: 'p95' | 'p99_rate' | 'avg') =>
convertV1ChartConfigToV2(
Expand Down
43 changes: 22 additions & 21 deletions packages/app/src/__tests__/DBDashboardImportPage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
type DashboardTemplate,
DashboardTemplateSchema,
DashboardWithoutIdSchema,
DisplayType,
SourceKind,
} from '@hyperdx/common-utils/dist/types';
import { act, fireEvent, screen, waitFor } from '@testing-library/react';
Expand Down Expand Up @@ -95,7 +96,7 @@ jest.mock('../api', () => ({
// satisfy the schema without a real query.
const builderTile = (
id: string,
displayType: string,
displayType: DisplayType,
source: string,
y: number,
) => ({
Expand Down Expand Up @@ -129,21 +130,21 @@ const allTileTypesTemplate: DashboardTemplate = {
h: 1,
config: {
name: 'tile-markdown',
displayType: 'markdown',
displayType: DisplayType.Markdown,
source: '',
where: '',
whereLanguage: 'sql',
select: [],
markdown: '## Overview',
},
},
builderTile('tile-number', 'number', 'Metrics', 1),
builderTile('tile-line', 'line', 'Metrics', 4),
builderTile('tile-stacked_bar', 'stacked_bar', 'Metrics', 7),
builderTile('tile-table', 'table', 'Traces', 10),
builderTile('tile-pie', 'pie', 'Metrics', 13),
builderTile('tile-heatmap', 'heatmap', 'Traces', 16),
builderTile('tile-search', 'search', 'Logs', 19),
builderTile('tile-number', DisplayType.Number, 'Metrics', 1),
builderTile('tile-line', DisplayType.Line, 'Metrics', 4),
builderTile('tile-stacked_bar', DisplayType.StackedBar, 'Metrics', 7),
builderTile('tile-table', DisplayType.Table, 'Traces', 10),
builderTile('tile-pie', DisplayType.Pie, 'Metrics', 13),
builderTile('tile-heatmap', DisplayType.Heatmap, 'Traces', 16),
builderTile('tile-search', DisplayType.Search, 'Logs', 19),
{
id: 'tile-rawsql',
x: 0,
Expand All @@ -152,7 +153,7 @@ const allTileTypesTemplate: DashboardTemplate = {
h: 3,
config: {
name: 'tile-rawsql',
displayType: 'table',
displayType: DisplayType.Table,
configType: 'sql',
connection: 'Default',
sqlTemplate: 'SELECT 1',
Expand All @@ -170,15 +171,15 @@ const allTileTypesTemplate: DashboardTemplate = {
whereLanguage: 'sql',
},
],
} as DashboardTemplate;
};

// A template whose only filter names a source that doesn't exist in the
// workspace, so the auto-mapping effect can't resolve it and the mapping select
// stays empty.
const unresolvedFilterSourceTemplate = DashboardTemplateSchema.parse({
version: '0.1.0',
name: 'Unresolved Filter Source',
tiles: [builderTile('tile-number', 'number', 'Metrics', 0)],
tiles: [builderTile('tile-number', DisplayType.Number, 'Metrics', 0)],
filters: [
{
id: 'filter-machine',
Expand All @@ -196,7 +197,7 @@ const unresolvedFilterSourceTemplate = DashboardTemplateSchema.parse({
const promqlFilterTemplate = DashboardTemplateSchema.parse({
version: '0.1.0',
name: 'PromQL Label Filter',
tiles: [builderTile('tile-number', 'number', 'Metrics', 0)],
tiles: [builderTile('tile-number', DisplayType.Number, 'Metrics', 0)],
filters: [
{
id: 'filter-service',
Expand All @@ -217,7 +218,7 @@ const promqlFilterTemplate = DashboardTemplateSchema.parse({
const promqlFilterOnLogSourceTemplate = DashboardTemplateSchema.parse({
version: '0.1.0',
name: 'PromQL Label Filter On Log Source',
tiles: [builderTile('tile-number', 'number', 'Metrics', 0)],
tiles: [builderTile('tile-number', DisplayType.Number, 'Metrics', 0)],
filters: [
{
id: 'filter-service',
Expand All @@ -237,7 +238,7 @@ const promqlFilterOnLogSourceTemplate = DashboardTemplateSchema.parse({
const queriedFilterTemplate = DashboardTemplateSchema.parse({
version: '0.1.0',
name: 'Queried Filter',
tiles: [builderTile('tile-number', 'number', 'Metrics', 0)],
tiles: [builderTile('tile-number', DisplayType.Number, 'Metrics', 0)],
filters: [
{
id: 'filter-service',
Expand Down Expand Up @@ -274,7 +275,7 @@ const MISSING = 'Does Not Exist In This Workspace';
const unresolvedTileSourceTemplate = DashboardTemplateSchema.parse({
version: '0.1.0',
name: 'Unresolved Tile Source',
tiles: [builderTile('tile-number', 'number', MISSING, 0)],
tiles: [builderTile('tile-number', DisplayType.Number, MISSING, 0)],
});

const unresolvedConnectionTemplate = DashboardTemplateSchema.parse({
Expand Down Expand Up @@ -303,7 +304,7 @@ const sqlQueryFilterTemplate = (connection: string, source?: string) =>
DashboardTemplateSchema.parse({
version: '0.1.0',
name: 'SQL Query Filter',
tiles: [builderTile('tile-number', 'number', 'Metrics', 0)],
tiles: [builderTile('tile-number', DisplayType.Number, 'Metrics', 0)],
filters: [
{
id: 'filter-env',
Expand All @@ -325,7 +326,7 @@ const markdownStaleSourceTemplate = DashboardTemplateSchema.parse({
name: 'Markdown With Stale Source',
tiles: [
markdownTileWithSource('tile-markdown', MISSING, 0),
builderTile('tile-number', 'number', 'Metrics', 1),
builderTile('tile-number', DisplayType.Number, 'Metrics', 1),
],
});

Expand Down Expand Up @@ -761,7 +762,7 @@ describe('Dashboard import - filter source kind', () => {
const adhocFilterTemplate = DashboardTemplateSchema.parse({
version: '0.1.0',
name: 'Ad Hoc Filter',
tiles: [builderTile('tile-search', 'search', 'Logs', 0)],
tiles: [builderTile('tile-search', DisplayType.Search, 'Logs', 0)],
filters: [
{
id: 'filter-adhoc',
Expand Down Expand Up @@ -877,7 +878,7 @@ describe('Dashboard import - data source variables', () => {
const sourceVariableTemplate = DashboardTemplateSchema.parse({
version: '0.1.0',
name: 'Source Variables',
tiles: [builderTile('tile-line', 'line', '$logs', 0)],
tiles: [builderTile('tile-line', DisplayType.Line, '$logs', 0)],
filters: [
{
id: 'ds',
Expand Down Expand Up @@ -937,7 +938,7 @@ describe('Dashboard import - data source variables', () => {
const template = DashboardTemplateSchema.parse({
version: '0.1.0',
name: 'Undeclared',
tiles: [builderTile('tile-line', 'line', '$traces', 0)],
tiles: [builderTile('tile-line', DisplayType.Line, '$traces', 0)],
filters: [
{
id: 'svc',
Expand Down
9 changes: 5 additions & 4 deletions packages/app/src/__tests__/DBSearchPageQueryKey.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {

import { DBTimeChart } from '@/components/DBTimeChart';
import SearchTotalCountChart from '@/components/SearchTotalCountChart';
import { useQueriedChartConfig } from '@/hooks/useChartConfig';

// Mock the API and hooks
jest.mock('@/hooks/useResultColumnFilterKeys', () => ({
Expand Down Expand Up @@ -72,11 +73,11 @@ jest.mock('@/ChartUtils', () => ({
}));

describe('DBSearchPage QueryKey Consistency', () => {
let mockUseQueriedChartConfig: jest.Mock;
const mockUseQueriedChartConfig: jest.Mock = jest.mocked(
useQueriedChartConfig,
);

beforeEach(async () => {
mockUseQueriedChartConfig = (await import('@/hooks/useChartConfig'))
.useQueriedChartConfig as any;
beforeEach(() => {
mockUseQueriedChartConfig.mockClear();
});

Expand Down
Loading
Loading