Skip to content

Fix axis config for split sections #3213

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

Open
kuzmadom wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix axis config for split sections #3213

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
66 changes: 37 additions & 29 deletions src/server/modes/charts/plugins/datalens/gravity-charts/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type {ChartData, ChartTitle} from '@gravity-ui/chartkit/gravity-charts';
import type {ChartData, ChartTitle, ChartYAxis} from '@gravity-ui/chartkit/gravity-charts';

import {PlaceholderId, WizardVisualizationId, isDateField} from '../../../../../../../shared';
import type {
Expand Down Expand Up @@ -50,6 +50,40 @@ function getAxisMinMax(
return [Number.isNaN(min) ? undefined : min, Number.isNaN(max) ? undefined : max];
}

export function getYAxisBaseConfig({
visualization,
}: {
visualization: {id: string; placeholders: ServerPlaceholder[]};
}): ChartYAxis {
const yPlaceholder = visualization.placeholders.find((p) => p.id === PlaceholderId.Y);
const yPlaceholderSettings = yPlaceholder?.settings || {};
const yItem = yPlaceholder?.items[0];

const [yMin, yMax] = getAxisMinMax(yPlaceholderSettings);

return {
// todo: the axis type should depend on the type of field
type: isDateField(yItem) ? 'datetime' : 'linear',
visible: yPlaceholderSettings?.axisVisibility !== 'hide',
labels: {
enabled: Boolean(yItem) && yPlaceholder?.settings?.hideLabels !== 'yes',
rotation: getAxisLabelsRotationAngle(yPlaceholder?.settings),
},
title: {
text: getAxisTitle(yPlaceholderSettings, yItem) || undefined,
},
grid: {
enabled: Boolean(yItem) && isGridEnabled(yPlaceholderSettings),
},
ticks: {
pixelInterval: getTickPixelInterval(yPlaceholderSettings) || 72,
},
lineColor: 'var(--g-color-line-generic)',
min: yMin,
max: yMax,
};
}

export function getBaseChartConfig(args: {
extraSettings?: ServerCommonSharedExtraSettings;
visualization: {id: string; placeholders: ServerPlaceholder[]};
Expand All @@ -61,10 +95,6 @@ export function getBaseChartConfig(args: {
const xItem = xPlaceholder?.items[0];
const xPlaceholderSettings = xPlaceholder?.settings || {};

const yPlaceholder = visualization.placeholders.find((p) => p.id === PlaceholderId.Y);
const yPlaceholderSettings = yPlaceholder?.settings || {};
const yItem = yPlaceholder?.items[0];

let chartWidgetData: Partial<ChartData> = {
title: getChartTitle(extraSettings),
tooltip: {
Expand Down Expand Up @@ -128,7 +158,7 @@ export function getBaseChartConfig(args: {

if (!visualizationWithoutAxis.includes(visualizationId)) {
const [xMin, xMax] = getAxisMinMax(xPlaceholderSettings);
const [yMin, yMax] = getAxisMinMax(yPlaceholderSettings);

chartWidgetData = {
...chartWidgetData,
xAxis: {
Expand All @@ -150,29 +180,7 @@ export function getBaseChartConfig(args: {
min: xMin,
max: xMax,
},
yAxis: [
{
// todo: the axis type should depend on the type of field
type: isDateField(yItem) ? 'datetime' : 'linear',
visible: yPlaceholderSettings?.axisVisibility !== 'hide',
labels: {
enabled: Boolean(yItem) && yPlaceholder?.settings?.hideLabels !== 'yes',
rotation: getAxisLabelsRotationAngle(yPlaceholder?.settings),
},
title: {
text: getAxisTitle(yPlaceholderSettings, yItem) || undefined,
},
grid: {
enabled: Boolean(yItem) && isGridEnabled(yPlaceholderSettings),
},
ticks: {
pixelInterval: getTickPixelInterval(yPlaceholderSettings) || 72,
},
lineColor: 'var(--g-color-line-generic)',
min: yMin,
max: yMax,
},
],
yAxis: [getYAxisBaseConfig({visualization})],
};

if (visualizationWithYMainAxis.includes(visualizationId)) {
Expand Down
10 changes: 7 additions & 3 deletions src/server/modes/charts/plugins/datalens/preparers/bar-x/gravity-charts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
isNumberField,
} from '../../../../../../../shared';
import type {WrappedHTML} from '../../../../../../../shared/types/charts';
import {getBaseChartConfig} from '../../gravity-charts/utils';
import {getBaseChartConfig, getYAxisBaseConfig} from '../../gravity-charts/utils';
import {getFormattedLabel} from '../../gravity-charts/utils/dataLabels';
import {getFieldFormatOptions} from '../../gravity-charts/utils/format';
import {getConfigWithActualFieldTypes} from '../../utils/config-helpers';
Expand Down Expand Up @@ -232,14 +232,18 @@ export function prepareGravityChartBarX(args: PrepareFunctionArgs) {
legend,
xAxis,
yAxis: segments.map((d) => {
return {
const axisBaseConfig = getYAxisBaseConfig({
visualization: {placeholders, id: visualizationId},
});

return merge(axisBaseConfig, {
labels: {
numberFormat: axisLabelNumberFormat ?? undefined,
},
plotIndex: d.index,
position: d.isOpposite ? 'right' : 'left',
title: isSplitEnabled ? {text: d.title} : undefined,
};
});
}),
split: {
enable: isSplitEnabled,
Expand Down
10 changes: 7 additions & 3 deletions src/server/modes/charts/plugins/datalens/preparers/line/gravity-charts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
isMarkupField,
isNumberField,
} from '../../../../../../../shared';
import {getBaseChartConfig} from '../../gravity-charts/utils';
import {getBaseChartConfig, getYAxisBaseConfig} from '../../gravity-charts/utils';
import {getFormattedLabel} from '../../gravity-charts/utils/dataLabels';
import {getFieldFormatOptions} from '../../gravity-charts/utils/format';
import {getConfigWithActualFieldTypes} from '../../utils/config-helpers';
Expand Down Expand Up @@ -192,11 +192,15 @@ export function prepareGravityChartLine(args: PrepareFunctionArgs) {
},
xAxis,
yAxis: segments.map((d) => {
return {
const axisBaseConfig = getYAxisBaseConfig({
visualization: {placeholders, id: visualizationId},
});

return merge(axisBaseConfig, {
title: isSplitEnabled ? {text: d.title} : undefined,
plotIndex: d.index,
position: d.isOpposite ? 'right' : 'left',
};
});
}),
split: {
enable: isSplitEnabled,
Expand Down
Loading