diff --git a/packages/app/src/ChartUtils.tsx b/packages/app/src/ChartUtils.tsx index b8ed2c83a..aaee372f0 100644 --- a/packages/app/src/ChartUtils.tsx +++ b/packages/app/src/ChartUtils.tsx @@ -77,6 +77,10 @@ const seriesDisplayName = ( } = {}, ) => { if (s.type === 'time' || s.type === 'table') { + if (s.displayName != null) { + return s.displayName; + } + const displayField = s.aggFn !== 'count' ? s.table === 'metrics' @@ -113,13 +117,16 @@ export function seriesColumns({ ? [ { dataKey: `series_0.data`, - displayName: `${seriesDisplayName(series[0], { - showField, - showWhere, - })}/${seriesDisplayName(series[1], { - showField, - showWhere, - })}`, + displayName: + 'displayName' in series[0] && series[0].displayName != null + ? series[0].displayName + : `${seriesDisplayName(series[0], { + showField, + showWhere, + })}/${seriesDisplayName(series[1], { + showField, + showWhere, + })}`, sortOrder: 'sortOrder' in series[0] ? series[0].sortOrder : undefined, }, diff --git a/packages/app/src/HDXMultiSeriesTableChart.tsx b/packages/app/src/HDXMultiSeriesTableChart.tsx index 0f1c07ee0..07aa7c339 100644 --- a/packages/app/src/HDXMultiSeriesTableChart.tsx +++ b/packages/app/src/HDXMultiSeriesTableChart.tsx @@ -1,8 +1,6 @@ -import { memo, useCallback, useEffect, useMemo, useRef } from 'react'; +import { memo, useCallback, useRef } from 'react'; import Link from 'next/link'; -import { useRouter } from 'next/router'; -import cx from 'classnames'; -import { Anchor, Flex, Text } from '@mantine/core'; +import { Flex, Text } from '@mantine/core'; import { flexRender, getCoreRowModel, @@ -22,7 +20,6 @@ import { } from './ChartUtils'; import { UNDEFINED_WIDTH } from './tableUtils'; import type { ChartSeries, NumberFormat } from './types'; -import { AggFn } from './types'; import { formatNumber } from './utils'; const Table = ({ @@ -135,8 +132,6 @@ const Table = ({
@@ -287,10 +275,9 @@ const HDXMultiSeriesTableChart = memo( config: { series, seriesReturnType = 'column', - // numberFormat, dateRange, - sortOrder, numberFormat, + groupColumnName, }, onSettled, onSortClick, @@ -302,6 +289,7 @@ const HDXMultiSeriesTableChart = memo( seriesReturnType: 'ratio' | 'column'; sortOrder: 'asc' | 'desc'; numberFormat?: NumberFormat; + groupColumnName?: string; }; onSettled?: () => void; onSortClick?: (seriesIndex: number) => void; @@ -346,9 +334,10 @@ const HDXMultiSeriesTableChart = memo(