From 0af960c49ec6511c28ed76664edfab15c03fd735 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 17:06:15 +0000 Subject: [PATCH 1/4] Update dependency @elastic/charts to v55 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index cc9081e57fb01..966bc2973f991 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@dnd-kit/utilities": "^2.0.0", "@elastic/apm-rum": "^5.12.0", "@elastic/apm-rum-react": "^1.4.2", - "@elastic/charts": "54.0.0", + "@elastic/charts": "55.0.0", "@elastic/datemath": "5.0.3", "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.6.0-canary.3", "@elastic/ems-client": "8.4.0", diff --git a/yarn.lock b/yarn.lock index 69d01d1874077..89a0a50cfcb29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1460,10 +1460,10 @@ dependencies: object-hash "^1.3.0" -"@elastic/charts@54.0.0": - version "54.0.0" - resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-54.0.0.tgz#97e19c87c94d4282c12440e9d5703048232bc2b8" - integrity sha512-gyAgBrRKRg+QxaOluAy1tJXm3gv95IuZRL+/QMUR7tuAwqfD+Bi3eFUoqMhVJCRmhYJa2iDmLMjb7Mkb7HZJgw== +"@elastic/charts@55.0.0": + version "55.0.0" + resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-55.0.0.tgz#df9a4e9b0a84a613f103011d99f120cb528c4dc9" + integrity sha512-a4UIieTi04CPHxfwztDe36xoPFkp+I4tRPXWXobv/aG/zTd4AwruRyL981RiV2Tv8Mrc5jpCJFgfadNoPrL3pg== dependencies: "@popperjs/core" "^2.4.0" bezier-easing "^2.1.0" From 5c64927420ffed2c90a6abeaeee609f68a5cd330 Mon Sep 17 00:00:00 2001 From: Marco Vettorello Date: Mon, 3 Apr 2023 12:27:30 +0200 Subject: [PATCH 2/4] fix type breaking changes --- .../public/components/heatmap_component.tsx | 4 ---- .../charts/__snapshots__/donut_chart.test.tsx.snap | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx index 51ede8e7f59ba..93f93f149f581 100644 --- a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx +++ b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx @@ -516,10 +516,6 @@ export const HeatmapComponent: FC = memo( chartTheme.axes?.gridLine?.horizontal?.stroke ?? '#D3DAE6', }, - cellHeight: { - max: 'fill', - min: 1, - }, }, cell: { maxWidth: 'fill', diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/__snapshots__/donut_chart.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/__snapshots__/donut_chart.test.tsx.snap index 58e01666035e8..5cc141d7c14fb 100644 --- a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/__snapshots__/donut_chart.test.tsx.snap +++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/__snapshots__/donut_chart.test.tsx.snap @@ -329,21 +329,11 @@ exports[`DonutChart component passes correct props without errors for valid prop "maxWidth": "fill", }, "grid": Object { - "cellHeight": Object { - "max": 30, - "min": 12, - }, - "cellWidth": Object { - "max": 30, - "min": 0, - }, "stroke": Object { "color": "gray", "width": 1, }, }, - "maxColumnWidth": 30, - "maxRowHeight": 30, "xAxisLabel": Object { "fontFamily": "Sans-Serif", "fontSize": 12, From 8e4bddace884fa3dabe7a00fe2db540835be338e Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Mon, 3 Apr 2023 11:04:38 -0700 Subject: [PATCH 3/4] fix: remove all heatmap grid height/width constraints --- .../ml/public/application/explorer/swimlane_container.tsx | 4 ---- .../monitor_status/monitor_status_chart_theme.ts | 6 ------ .../monitor_details/monitor_status/monitor_status_data.ts | 1 - 3 files changed, 11 deletions(-) diff --git a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx index b211708c6f92f..a34c968eecfe4 100644 --- a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx +++ b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx @@ -291,10 +291,6 @@ export const SwimlaneContainer: FC = ({ }, heatmap: { grid: { - cellHeight: { - min: CELL_HEIGHT, - max: CELL_HEIGHT, - }, stroke: { width: BORDER_WIDTH, color: euiTheme.euiBorderColor, diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_chart_theme.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_chart_theme.ts index 022a928f2916c..3a24ab61b90ba 100644 --- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_chart_theme.ts +++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_chart_theme.ts @@ -7,7 +7,6 @@ import { HeatmapStyle, RecursivePartial } from '@elastic/charts'; import { EuiThemeComputed } from '@elastic/eui'; -import { CHART_CELL_WIDTH } from './monitor_status_data'; export function getMonitorStatusChartTheme( euiTheme: EuiThemeComputed, @@ -15,16 +14,11 @@ export function getMonitorStatusChartTheme( ): RecursivePartial { return { grid: { - cellHeight: { - min: 20, - }, stroke: { width: 0, color: 'transparent', }, }, - maxRowHeight: 30, - maxColumnWidth: CHART_CELL_WIDTH, cell: { maxWidth: 'fill', maxHeight: 3, diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts index f588ab242adf9..60651c8dba372 100644 --- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts +++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts @@ -20,7 +20,6 @@ import { PingStatus } from '../../../../../../common/runtime_types'; export const SUCCESS_VIZ_COLOR = VISUALIZATION_COLORS[0]; export const DANGER_VIZ_COLOR = VISUALIZATION_COLORS[VISUALIZATION_COLORS.length - 1]; -export const CHART_CELL_WIDTH = 17; export interface MonitorStatusTimeBucket { start: number; From f0f8c22f083be368d95a7b983ade8495c45017e5 Mon Sep 17 00:00:00 2001 From: nickofthyme Date: Mon, 3 Apr 2023 13:10:44 -0700 Subject: [PATCH 4/4] fix: add back constant variable --- .../monitor_details/monitor_status/monitor_status_data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts index 60651c8dba372..f588ab242adf9 100644 --- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts +++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts @@ -20,6 +20,7 @@ import { PingStatus } from '../../../../../../common/runtime_types'; export const SUCCESS_VIZ_COLOR = VISUALIZATION_COLORS[0]; export const DANGER_VIZ_COLOR = VISUALIZATION_COLORS[VISUALIZATION_COLORS.length - 1]; +export const CHART_CELL_WIDTH = 17; export interface MonitorStatusTimeBucket { start: number;