[FIX] figures: fix xlsx export

closes #7025

Task: 4755779
X-original-commit: 1e3d0ff
Signed-off-by: Pierre Rousseau (pro) <pro@odoo.com>
Signed-off-by: Florian Damhaut (flda) <flda@odoo.com>

Author: fdamhaut

src/xlsx/conversion/figure_conversion.ts

@@ -1,4 +1,4 @@
-import { DEFAULT_WINDOW_SIZE } from "../../constants";
+import { DEFAULT_WINDOW_SIZE, FIGURE_BORDER_WIDTH } from "../../constants";
 import {
   getFullReference,
   isDefined,
@@ -163,8 +163,8 @@ function convertExcelTrendline(
 
 function convertAnchor(XLSXanchor: XLSXFigureAnchor): AnchorOffset {
   const offset = {
-    x: convertEMUToDotValue(XLSXanchor.colOffset),
-    y: convertEMUToDotValue(XLSXanchor.rowOffset),
+    x: convertEMUToDotValue(XLSXanchor.colOffset) - FIGURE_BORDER_WIDTH,
+    y: convertEMUToDotValue(XLSXanchor.rowOffset) - FIGURE_BORDER_WIDTH,
   };
   return { col: XLSXanchor.col, row: XLSXanchor.row, offset };
 }

src/xlsx/conversion/sheet_conversion.ts

@@ -237,8 +237,13 @@ function getSheetDims(sheet: XLSXWorksheet): number[] {
     dims[1] = Math.max(dims[1], row.index);
   }
 
-  dims[0] = Math.max(dims[0], EXCEL_IMPORT_DEFAULT_NUMBER_OF_COLS);
-  dims[1] = Math.max(dims[1], EXCEL_IMPORT_DEFAULT_NUMBER_OF_ROWS);
+  for (const fig of sheet.figures) {
+    dims[0] = Math.max(dims[0], fig.anchors[fig.anchors.length - 1]?.col ?? 0);
+    dims[1] = Math.max(dims[1], fig.anchors[fig.anchors.length - 1]?.row ?? 0);
+  }
+
+  dims[0] = Math.max(dims[0] + 5, EXCEL_IMPORT_DEFAULT_NUMBER_OF_COLS);
+  dims[1] = Math.max(dims[1] + 5, EXCEL_IMPORT_DEFAULT_NUMBER_OF_ROWS);
 
   return dims;
 }

src/xlsx/functions/drawings.ts

@@ -108,7 +108,7 @@ function figureCoordinates(
   for (const [headerIndex, header] of headers.slice(anchor).entries()) {
     if (currentPosition <= offset && offset < currentPosition + header.size!) {
       return {
-        index: headerIndex,
+        index: anchor + headerIndex,
         offset: convertDotValueToEMU(offset - currentPosition + FIGURE_BORDER_WIDTH),
       };
     } else if (headerIndex < headers.length - 1) {

src/xlsx/helpers/content_helpers.ts

@@ -335,7 +335,7 @@ export function getColPosition(colIndex: number, sheetData: XLSXWorksheet): numb
 export function getRowPosition(rowIndex: number, sheetData: XLSXWorksheet) {
   let position = 0;
   for (let i = 0; i < rowIndex; i++) {
-    const rowAtIndex = sheetData.rows[i];
+    const rowAtIndex = sheetData.rows.find((row) => row.index - 1 === i);
     if (rowAtIndex?.height) {
       position += rowAtIndex.height;
     } else if (sheetData.sheetFormat?.defaultRowHeight) {

src/xlsx/xlsx_reader.ts

@@ -26,7 +26,7 @@ import { getXLSXFilesOfType } from "./helpers/xlsx_helper";
 import { XLSXImportWarningManager } from "./helpers/xlsx_parser_error_manager";
 import { escapeTagNamespaces, parseXML } from "./helpers/xml_helpers";
 
-const EXCEL_IMPORT_VERSION = "18.4.1";
+const EXCEL_IMPORT_VERSION = "18.4.2";
 
 export class XlsxReader {
   warningManager: XLSXImportWarningManager;

tests/xlsx/xlsx_import_export.test.ts

@@ -1,5 +1,4 @@
 import { Model } from "../../src";
-import { FIGURE_BORDER_WIDTH } from "../../src/constants";
 import { buildSheetLink, toZone } from "../../src/helpers";
 import {
   Align,
@@ -280,8 +279,8 @@ describe("Export data to xlsx then import it", () => {
     expect(importedFigure.height).toEqual(figure.height);
     expect(importedFigure.width).toBeBetween(figure.width - 1, figure.width + 1);
     expect(importedFigure.offset).toEqual({
-      x: figure.offset.x + FIGURE_BORDER_WIDTH,
-      y: figure.offset.y + FIGURE_BORDER_WIDTH,
+      x: figure.offset.x,
+      y: figure.offset.y,
     });
   });
 
@@ -401,4 +400,56 @@ describe("Export data to xlsx then import it", () => {
     expect(newFigure.width).toBe(300);
     expect(newFigure.height).toBe(400);
   });
+
+  test.each([
+    { offset: { x: 0, y: 0 }, col: 5, row: 5 },
+    { offset: { x: 10, y: 10 }, col: 10, row: 10 },
+    { offset: { x: 0, y: 10 }, col: 5, row: 0 },
+    { offset: { x: 10, y: 0 }, col: 0, row: 5 },
+  ])("Figure Position", (position) => {
+    createImage(model, {
+      figureId: "1",
+      size: {
+        width: 300,
+        height: 400,
+      },
+      ...position,
+    });
+
+    const figure = model.getters.getFigures(sheetId)[0];
+    const importedModel = exportToXlsxThenImport(model);
+    const newFigure = importedModel.getters.getFigures(sheetId)[0];
+    expect(newFigure).toMatchObject(figure);
+  });
+
+  test.each([
+    { offset: { x: 0, y: 0 }, col: 5, row: 5 },
+    { offset: { x: 10, y: 10 }, col: 10, row: 10 },
+    { offset: { x: 0, y: 10 }, col: 5, row: 0 },
+    { offset: { x: 10, y: 0 }, col: 0, row: 5 },
+  ])("Figure Position with custom row length", (position) => {
+    createChart(
+      model,
+      {
+        dataSets: [{ dataRange: "Sheet1!B1:B4" }, { dataRange: "Sheet1!C1:C4" }],
+        labelRange: "Sheet1!A2:A4",
+        type: "line",
+      },
+      "1",
+      sheetId,
+      {
+        figureId: "1",
+        size: {
+          width: 300,
+          height: 400,
+        },
+        ...position,
+      }
+    );
+    resizeRows(model, [50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60], 100);
+    const figure = model.getters.getFigures(sheetId)[0];
+    const importedModel = exportToXlsxThenImport(model);
+    const newFigure = importedModel.getters.getFigures(sheetId)[0];
+    expect(newFigure.height).toBe(figure.height);
+  });
 });