From 37674bf6887b5e1dde0fc58853e3c4ec6c0884f0 Mon Sep 17 00:00:00 2001 From: "Adrien Minne (adrm)" Date: Fri, 18 Jul 2025 12:49:36 +0000 Subject: [PATCH] [FIX] xlsx: correctly export aggregated charts Follow up of #6075, for charts combo/scatter charts. The feature to aggregate the chart data based on the labels does not exist in xlsx files. But rather than exporting the chart as normal, ignoring the aggregation, we exported the chart as an image. Task: 4954426 X-original-commit: e951963636f9ad205438313402624adee6f240fd --- src/helpers/figures/charts/combo_chart.ts | 4 ---- src/helpers/figures/charts/scatter_chart.ts | 4 ---- tests/xlsx/xlsx_export.test.ts | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/helpers/figures/charts/combo_chart.ts b/src/helpers/figures/charts/combo_chart.ts index 2bedd46c41..d46fa70fe3 100644 --- a/src/helpers/figures/charts/combo_chart.ts +++ b/src/helpers/figures/charts/combo_chart.ts @@ -151,10 +151,6 @@ export class ComboChart extends AbstractChart { } getDefinitionForExcel(): ExcelChartDefinition | undefined { - // Excel does not support aggregating labels - if (this.aggregated) { - return undefined; - } const dataSets: ExcelChartDataset[] = this.dataSets .map((ds: DataSet) => toExcelDataset(this.getters, ds)) .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference); diff --git a/src/helpers/figures/charts/scatter_chart.ts b/src/helpers/figures/charts/scatter_chart.ts index a4e7607687..1a7c20dbbc 100644 --- a/src/helpers/figures/charts/scatter_chart.ts +++ b/src/helpers/figures/charts/scatter_chart.ts @@ -179,10 +179,6 @@ export class ScatterChart extends AbstractChart { } getDefinitionForExcel(): ExcelChartDefinition | undefined { - // Excel does not support aggregating labels - if (this.aggregated) { - return undefined; - } const dataSets: ExcelChartDataset[] = this.dataSets .map((ds: DataSet) => toExcelDataset(this.getters, ds)) .filter((ds) => ds.range !== ""); diff --git a/tests/xlsx/xlsx_export.test.ts b/tests/xlsx/xlsx_export.test.ts index c0e6474be2..ea409aa64a 100644 --- a/tests/xlsx/xlsx_export.test.ts +++ b/tests/xlsx/xlsx_export.test.ts @@ -1274,7 +1274,7 @@ describe("Test XLSX export", () => { expect(await exportPrettifiedXlsx(model)).toMatchSnapshot(); }); - test.each(["bar", "line", "pie", "radar"] as const)( + test.each(["bar", "line", "pie", "radar", "scatter", "combo"] as const)( "%s chart that aggregate labels is exported as normal chart, ignoring the aggregation", async (type) => { const model = new Model();