Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(MetricChart): add legend to some charts #1893

Merged
merged 1 commit into from
Jan 31, 2025
+22 −24
Merged

feat(MetricChart): add legend to some charts #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@bem-react/classname": "^1.6.0",
"@ebay/nice-modal-react": "^1.2.13",
"@gravity-ui/axios-wrapper": "^1.5.1",
"@gravity-ui/chartkit": "^5.19.2",
"@gravity-ui/chartkit": "^5.20.0",
"@gravity-ui/components": "^3.13.2",
"@gravity-ui/date-components": "^2.11.0",
"@gravity-ui/date-utils": "^2.5.6",
Expand Down
9 changes: 6 additions & 3 deletions src/components/MetricChart/MetricChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

import ChartKit, {settings} from '@gravity-ui/chartkit';
import type {YagrSeriesData, YagrWidgetData} from '@gravity-ui/chartkit/yagr';
import type {YagrWidgetData} from '@gravity-ui/chartkit/yagr';
import {YagrPlugin} from '@gravity-ui/chartkit/yagr';

import {cn} from '../../utils/cn';
Expand Down Expand Up @@ -29,12 +29,12 @@ const prepareWidgetData = (
data: PreparedMetricsData,
options: ChartOptions = {},
): YagrWidgetData => {
const {dataType, scaleRange} = options;
const {dataType, scaleRange, showLegend} = options;
const defaultDataFormatter = getDefaultDataFormatter(dataType);

const isDataEmpty = !data.metrics.length;

const graphs: YagrSeriesData[] = data.metrics.map((metric, index) => {
const graphs: YagrWidgetData['data']['graphs'] = data.metrics.map((metric, index) => {
const lineColor = metric.color || colors[index];
const color = colorToRGBA(lineColor, 0.1);

Expand Down Expand Up @@ -91,6 +91,9 @@ const prepareWidgetData = (
show: true,
tracking: 'sticky',
},
legend: {
show: showLegend,
},
},
};
};
Expand Down
1 change: 1 addition & 0 deletions src/components/MetricChart/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export interface ChartOptions {
min?: number;
max?: number;
};
showLegend?: boolean;
}

export type ChartDataStatus = 'loading' | 'success' | 'error';
Expand Down
17 changes: 5 additions & 12 deletions ...ainers/Tenant/Diagnostics/TenantOverview/DefaultOverviewContent/defaultDashboardConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,24 @@ export const defaultDashboardConfig: ChartConfig[] = [
metrics: [
{
target: 'queries.latencies.p50',
title: i18n('charts.transaction-latency', {
percentile: 'p50',
}),
title: 'p50',
},
{
target: 'queries.latencies.p75',
title: i18n('charts.transaction-latency', {
percentile: 'p75',
}),
title: 'p75',
},
{
target: 'queries.latencies.p90',
title: i18n('charts.transaction-latency', {
percentile: 'p90',
}),
title: 'p90',
},
{
target: 'queries.latencies.p99',
title: i18n('charts.transaction-latency', {
percentile: 'p99',
}),
title: 'p99',
},
],
options: {
dataType: 'ms',
showLegend: true,
},
},
];
1 change: 1 addition & 0 deletions src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/cpuDashboardConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const cpuDashboardConfig: ChartConfig[] = [
min: 0,
max: 1,
},
showLegend: true,
},
},
];
Loading