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

Jump to bottom

[XY] Add minTimeBarInterval arg #128726

Merged
merged 17 commits into from
May 17, 2022
Merged

[XY] Add minTimeBarInterval arg #128726

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8151c16
Added `xAxisInterval` arg
VladLasitsa Mar 29, 2022
91aee1b
Merge branch 'main' into chart_expressions_xy_add_interval_arg
kibanamachine Apr 27, 2022
530d42c
Merge branch 'main' into chart_expressions_xy_add_interval_arg
kibanamachine Apr 29, 2022
a0837b4
Merge branch 'main' into chart_expressions_xy_add_interval_arg
kibanamachine May 2, 2022
c364bc6
Merge branch 'main' into chart_expressions_xy_add_interval_arg
VladLasitsa May 4, 2022
2fc8a44
Add validation
VladLasitsa May 4, 2022
1cdb5c0
Add tests
VladLasitsa May 4, 2022
8d37395
Merge branch 'main' into chart_expressions_xy_add_interval_arg
kibanamachine May 11, 2022
decfdc8
Rename xAxisInterval to minTimeBarInterval and add validation
VladLasitsa May 11, 2022
dc70053
Fix imports
VladLasitsa May 11, 2022
1171fb3
Add tests to validation
VladLasitsa May 11, 2022
9324056
Merge remote-tracking branch 'upstream/main' into chart_expressions_x…
VladLasitsa May 13, 2022
9026e8e
Fix conflicts
VladLasitsa May 13, 2022
1111f5e
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine May 13, 2022
3ca7d2c
Merge remote-tracking branch 'upstream/main' into chart_expressions_x…
VladLasitsa May 17, 2022
ad797d6
Fix tests
VladLasitsa May 17, 2022
83cb560
Merge remote-tracking branch 'upstream/main' into chart_expressions_x…
VladLasitsa May 17, 2022
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
6 changes: 6 additions & 0 deletions src/plugins/chart_expressions/expression_xy/common/expression_functions/xy_vis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@ export const xyVisFunction: ExpressionFunctionDefinition<
defaultMessage: 'Show values in legend',
}),
},
xAxisInterval: {
VladLasitsa marked this conversation as resolved.
Show resolved Hide resolved
types: ['string'],
help: i18n.translate('expressionXY.xyVis.interval.help', {
defaultMessage: 'Specifies the interval for x-axis',
}),
},
ariaLabel: {
types: ['string'],
help: i18n.translate('expressionXY.xyVis.ariaLabel.help', {
Expand Down
1 change: 1 addition & 0 deletions src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ export interface XYArgs {
hideEndzones?: boolean;
valuesInLegend?: boolean;
ariaLabel?: string;
xAxisInterval?: string;
}

export interface AnnotationLayerArgs {
Expand Down
5 changes: 4 additions & 1 deletion src/plugins/chart_expressions/expression_xy/public/helpers/interval.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { XYChartProps } from '../../common';
import { getFilteredLayers } from './layers';
import { isDataLayer } from './visualization';

export function calculateMinInterval({ args: { layers }, data }: XYChartProps) {
export function calculateMinInterval({ args: { layers, xAxisInterval }, data }: XYChartProps) {
const filteredLayers = getFilteredLayers(layers, data);
if (filteredLayers.length === 0) return;
const isTimeViz = filteredLayers.every((l) => isDataLayer(l) && l.xScaleType === 'time');
Expand All @@ -20,6 +20,9 @@ export function calculateMinInterval({ args: { layers }, data }: XYChartProps) {
);

if (!xColumn) return;
if (xAxisInterval) {
return search.aggs.parseInterval(xAxisInterval)?.as('milliseconds');
}
if (!isTimeViz) {
const histogramInterval = search.aggs.getNumberHistogramIntervalByDatatableColumn(xColumn);
if (typeof histogramInterval === 'number') {
Expand Down