[REV] pivot: chart field with mix of text and numbers

This reverts commit f28aac0.

It raises a lot of tickets so we prefer to revert it for now and take the time to fix it properly.

opw-4800411

closes #6508

Task: 4800411
X-original-commit: ab92eab
Signed-off-by: Lucas Lefèvre (lul) <[email protected]>
Signed-off-by: Pierre Rousseau (pro) <[email protected]>

Author: pro-odoo

src/helpers/pivot/pivot_helpers.ts

@@ -37,9 +37,11 @@ const AGGREGATOR_NAMES = {
   sum: _t("Sum"),
 };
 
+const NUMBER_CHAR_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
+
 const AGGREGATORS_BY_FIELD_TYPE = {
-  integer: ["max", "min", "avg", "sum", "count_distinct", "count"],
-  char: ["count_distinct", "count"],
+  integer: NUMBER_CHAR_AGGREGATORS,
+  char: NUMBER_CHAR_AGGREGATORS,
   boolean: ["count_distinct", "count", "bool_and", "bool_or"],
   datetime: ["max", "min", "count_distinct", "count"],
 };

src/helpers/pivot/spreadsheet_pivot/spreadsheet_pivot.ts

@@ -483,11 +483,7 @@ export class SpreadsheetPivot implements Pivot<SpreadsheetPivotRuntimeDefinition
         if (cell.value === "") {
           entry[field.name] = { value: null, type: CellValueType.empty, formattedValue: "" };
         } else {
-          if (field.type === "char") {
-            entry[field.name] = { ...cell, value: cell.formattedValue || null };
-          } else {
-            entry[field.name] = cell;
-          }
+          entry[field.name] = cell;
         }
       }
       entry["__count"] = { value: 1, type: CellValueType.number, formattedValue: "1" };

tests/pivots/spreadsheet_pivot/spreadsheet_pivot.test.ts

@@ -631,6 +631,21 @@ describe("Spreadsheet Pivot", () => {
     );
   });
 
+  test("Sum with a field that contains a string should work", () => {
+    const model = createModelWithPivot("A1:I5");
+    updatePivot(model, "1", {
+      columns: [],
+      rows: [],
+      measures: [{ id: "Expected Revenue:sum", fieldName: "Expected Revenue", aggregator: "sum" }],
+    });
+    setCellContent(model, "A26", `=pivot(1)`);
+    expect(getCellContent(model, "B28")).toBe("$17,500.00");
+
+    expect(getCellContent(model, "F2")).toBe("$2,000.00");
+    setCellContent(model, "F2", "Hello");
+    expect(getCellContent(model, "B28")).toBe("$15,500.00");
+  });
+
   test("quarter_number should be supported", () => {
     const model = createModelWithPivot("A1:I5");
     updatePivot(model, "1", {
@@ -878,15 +893,38 @@ describe("Spreadsheet Pivot", () => {
     expect(getEvaluatedCell(model, "A27").value).toBe(aggregatedValue);
   });
 
+  test.each([
+    ["sum", 15],
+    ["count", 3],
+    ["count_distinct", 3],
+    ["max", 10],
+    ["min", 5],
+    ["avg", 7.5],
+  ])("PIVOT.VALUE measure mixing text and number %s grand total", (aggregator, aggregatedValue) => {
+    const grid = {
+      A1: "Name",
+      A2: "Alice",
+      A3: "5",
+      A4: "10",
+    };
+    const model = createModelFromGrid(grid);
+    addPivot(model, "A1:A4", {
+      columns: [],
+      rows: [],
+      measures: [{ id: `Name:${aggregator}`, fieldName: "Name", aggregator }],
+    });
+    setCellContent(model, "A27", `=PIVOT.VALUE(1, "Name:${aggregator}")`);
+    expect(getEvaluatedCell(model, "A27").value).toBe(aggregatedValue);
+  });
+
   test("min and max aggregate format is inferred", () => {
     // prettier-ignore
     const grid = {
       A1: "Name",   B1: "Revenue",
-      A2: "Alice",  B2: "22",
+      A2: "Alice",  B2: "Hi",
       A3: "Bob",    B3: "5",
     };
     const model = createModelFromGrid(grid);
-    setFormat(model, "B2", "[$€]#,##0");
     setFormat(model, "B3", "[$$]#,##0");
     addPivot(model, "A1:B3", {
       columns: [],
@@ -898,7 +936,7 @@ describe("Spreadsheet Pivot", () => {
     });
     setCellContent(model, "A27", '=PIVOT.VALUE(1, "Revenue:max")');
     setCellContent(model, "A28", '=PIVOT.VALUE(1, "Revenue:min")');
-    expect(getEvaluatedCell(model, "A27").format).toBe("[$€]#,##0");
+    expect(getEvaluatedCell(model, "A27").format).toBe("[$$]#,##0");
     expect(getEvaluatedCell(model, "A28").format).toBe("[$$]#,##0");
   });
 
@@ -1993,37 +2031,6 @@ describe("Spreadsheet Pivot", () => {
     expect(model.getters.getPivotCoreDefinition("1")).toBeTruthy();
     expect(model.getters.getPivot("1")).toBeTruthy();
   });
-
-  test("char dimension supports mix of number and texts", () => {
-    // prettier-ignore
-    const grid = {
-      A1: "Customer",   B1: "Price", C1: "=PIVOT(1)",
-      A2: "Alice",      B2: "10",
-      A3: "",           B3: "20",
-      A4: "1",          B4: "30",
-      A5: "2",          B5: "40",
-      A6: "2",          B6: "50",
-      A7: '="1"',       B7: "60",
-    };
-    const model = createModelFromGrid(grid);
-    setFormat(model, "A6", "m/d/yyyy");
-    addPivot(model, "A1:B7", {
-      rows: [{ fieldName: "Customer", order: "asc" }],
-      columns: [],
-      measures: [{ id: "Price:sum", fieldName: "Price", aggregator: "sum" }],
-    });
-    // prettier-ignore
-    expect(getEvaluatedGrid(model, "C1:D8")).toEqual([
-      ["(#1) Pivot",     "Total"],
-      ["",               "Price"],
-      ["1",              "90"],
-      ["1/1/1900",       "50"],
-      ["2",              "40"],
-      ["Alice",          "10"],
-      ["(Undefined)",    "20"],
-      ["Total",          "210"],
-    ]);
-  });
 });
 
 describe("Spreadsheet arguments parsing", () => {