Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
"@cypress/webpack-preprocessor": "^5.5.0",
"@elastic/apm-rum": "^5.6.1",
"@elastic/apm-rum-react": "^1.2.5",
"@elastic/charts": "24.4.0",
"@elastic/charts": "24.5.1",
"@elastic/eslint-config-kibana": "link:packages/elastic-eslint-config-kibana",
"@elastic/eslint-plugin-eui": "0.0.2",
"@elastic/github-checks-reporter": "0.0.20b3",
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_type_xy/public/config/get_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

import { ScaleContinuousType } from '@elastic/charts/dist/scales';
import { ScaleContinuousType } from '@elastic/charts';

import { Datatable } from '../../../expressions/public';
import { BUCKET_TYPES } from '../../../data/public';
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_type_xy/public/utils/render_all_series.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {
SeriesName,
Accessor,
AccessorFn,
ColorVariant,
} from '@elastic/charts';
import { ColorVariant } from '@elastic/charts/dist/utils/commons';

import { DatatableRow } from '../../../expressions/public';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import {
DARK_THEME,
LIGHT_THEME,
Fit,
Position,
} from '@elastic/charts';
import {
EUI_CHARTS_THEME_DARK,
EUI_CHARTS_THEME_LIGHT,
} from '@elastic/eui/dist/eui_charts_theme';
import { Position } from '@elastic/charts/dist/utils/commons';
import styled from 'styled-components';
import { PercentileAnnotations } from '../PageLoadDistribution/PercentileAnnotations';
import { I18LABELS } from '../translations';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {
SeriesNameFn,
Settings,
timeFormatter,
Position,
} from '@elastic/charts';
import { Position } from '@elastic/charts/dist/utils/commons';
import {
EUI_CHARTS_THEME_DARK,
EUI_CHARTS_THEME_LIGHT,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
*/

import React from 'react';
import { Partition, SeriesIdentifier, Settings } from '@elastic/charts';
import {
Partition,
SeriesIdentifier,
Settings,
NodeColorAccessor,
ShapeTreeNode,
} from '@elastic/charts/dist/chart_types/partition_chart/layout/types/viewmodel_types';
import { HierarchyOfArrays } from '@elastic/charts/dist/chart_types/partition_chart/layout/utils/group_by_rollup';
HierarchyOfArrays,
} from '@elastic/charts';
import { shallow } from 'enzyme';
import { LensMultiTable } from '../types';
import { PieComponent } from './render_function';
Expand Down Expand Up @@ -214,7 +216,10 @@ describe('PieVisualization component', () => {
const defaultArgs = getDefaultArgs();
const component = shallow(<PieComponent args={{ ...args }} {...defaultArgs} />);
component.find(Settings).first().prop('onElementClick')!([
[[{ groupByRollup: 6, value: 6 }], {} as SeriesIdentifier],
[
[{ groupByRollup: 6, value: 6, depth: 1, path: [], sortIndex: 1 }],
{} as SeriesIdentifier,
],
]);

expect(defaultArgs.onClickValue.mock.calls[0][0]).toMatchInlineSnapshot(`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,13 @@ describe('render helpers', () => {
{ a: 'Foo', b: 6 },
],
};
expect(getFilterContext([{ groupByRollup: 'Test', value: 100 }], ['a'], table)).toEqual({
expect(
getFilterContext(
[{ groupByRollup: 'Test', value: 100, depth: 1, path: [], sortIndex: 1 }],
['a'],
table
)
).toEqual({
data: [
{
row: 1,
Expand All @@ -90,7 +96,13 @@ describe('render helpers', () => {
{ a: 'Foo', b: 'Three', c: 6 },
],
};
expect(getFilterContext([{ groupByRollup: 'Test', value: 100 }], ['a', 'b'], table)).toEqual({
expect(
getFilterContext(
[{ groupByRollup: 'Test', value: 100, depth: 1, path: [], sortIndex: 1 }],
['a', 'b'],
table
)
).toEqual({
data: [
{
row: 1,
Expand Down Expand Up @@ -119,8 +131,8 @@ describe('render helpers', () => {
expect(
getFilterContext(
[
{ groupByRollup: 'Test', value: 100 },
{ groupByRollup: 'Two', value: 5 },
{ groupByRollup: 'Test', value: 100, depth: 1, path: [], sortIndex: 1 },
{ groupByRollup: 'Two', value: 5, depth: 1, path: [], sortIndex: 1 },
],
['a', 'b'],
table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import {
ElementClickListener,
TooltipValue,
HeatmapSpec,
TooltipSettings,
HeatmapBrushEvent,
} from '@elastic/charts';
import moment from 'moment';
import { HeatmapBrushEvent } from '@elastic/charts/dist/chart_types/heatmap/layout/types/config_types';

import { i18n } from '@kbn/i18n';
import { TooltipSettings } from '@elastic/charts/dist/specs/settings';
import { SwimLanePagination } from './swimlane_pagination';
import { AppStateSelectedCells, OverallSwimlaneData, ViewBySwimLaneData } from './explorer_utils';
import { ANOMALY_THRESHOLD, SEVERITY_COLORS } from '../../../common';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

import React from 'react';
import moment from 'moment';
import { AnnotationTooltipFormatter, RectAnnotation } from '@elastic/charts';
import { RectAnnotationDatum } from '@elastic/charts/dist/chart_types/xy_chart/utils/specs';
import { AnnotationTooltipFormatter, RectAnnotation, RectAnnotationDatum } from '@elastic/charts';
import { AnnotationTooltip } from './annotation_tooltip';
import {
ANOMALY_SEVERITY,
Expand Down
14 changes: 4 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2146,10 +2146,10 @@
dependencies:
object-hash "^1.3.0"

"@elastic/charts@24.4.0":
version "24.4.0"
resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-24.4.0.tgz#217f55540f48a8f59c49250781d99c36110b2544"
integrity sha512-8dxDEs0g1mV4MjPgIArAmdDQDKjH8EitCLh8/Rouv8kkxvdXnL86VkSHpUbZNK9zPAecArwHBSkyCBZNmbqT2A==
"@elastic/charts@24.5.1":
version "24.5.1"
resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-24.5.1.tgz#4757721b0323b15412c92d696dd76fdef9b963f8"
integrity sha512-eHJna3xyHREaSfTRb+3/34EmyoINopH6yP9KReakXRb0jW8DD4n9IkbPFwpVN3uXQ6ND2x1ObA0ZzLPSLCPozg==
dependencies:
"@popperjs/core" "^2.4.0"
chroma-js "^2.1.0"
Expand All @@ -2161,7 +2161,6 @@
d3-scale "^1.0.7"
d3-shape "^1.3.4"
newtype-ts "^0.2.4"
path2d-polyfill "^0.4.2"
prop-types "^15.7.2"
re-reselect "^3.4.0"
react-redux "^7.1.0"
Expand Down Expand Up @@ -22803,11 +22802,6 @@ path-type@^4.0.0:
resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==

path2d-polyfill@^0.4.2:
version "0.4.2"
resolved "https://registry.yarnpkg.com/path2d-polyfill/-/path2d-polyfill-0.4.2.tgz#594d3103838ef6b9dd4a7fd498fe9a88f1f28531"
integrity sha512-JSeAnUfkFjl+Ml/EZL898ivMSbGHrOH63Mirx5EQ1ycJiryHDmj1Q7Are+uEPvenVGCUN9YbolfGfyUewJfJEg==

pathval@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
Expand Down