[FIX] pivot: can add the same granularity

we can add multiple time the same date granularity
it shouldn't be possible

closes #8098

Task: 5949522
X-original-commit: b8f8da3
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
Signed-off-by: Marceline Thomas (matho) <matho@odoo.com>

Author: matho-odoo

packages/o-spreadsheet-engine/src/helpers/pivot/pivot_registry.ts

@@ -57,12 +57,19 @@ const dateGranularities = [
   "day_of_week",
 ];
 
+export const datetimeGranularities = [
+  ...dateGranularities,
+  "hour_number",
+  "minute_number",
+  "second_number",
+];
+
 pivotRegistry.add("SPREADSHEET", {
   ui: SpreadsheetPivot,
   definition: SpreadsheetPivotRuntimeDefinition,
   dateGranularities: [...dateGranularities],
-  datetimeGranularities: [...dateGranularities, "hour_number", "minute_number", "second_number"],
   isMeasureCandidate: (field: PivotField) => field.type !== "boolean",
+  datetimeGranularities: [...datetimeGranularities],
   isGroupable: () => true,
   canHaveCustomGroup: (field: PivotField) => field.type === "char" && !field.isCustomField,
   isPivotUnused: () => true,

src/components/side_panel/pivot/pivot_side_panel/pivot_side_panel_store.ts

@@ -280,8 +280,7 @@ export class PivotSidePanelStore extends SpreadsheetStore {
     for (const dimension of columnsWithGranularity.concat(rowsWithGranularity)) {
       const fieldType = fields[dimension.fieldName]?.type;
       if ((fieldType === "date" || fieldType === "datetime") && !dimension.granularity) {
-        const granularity =
-          unusedGranularities[dimension.fieldName]?.values().next().value || "year";
+        const granularity = unusedGranularities[dimension.fieldName]?.values().next().value;
         unusedGranularities[dimension.fieldName]?.delete(granularity);
         dimension.granularity = granularity;
       }
@@ -314,7 +313,7 @@ export class PivotSidePanelStore extends SpreadsheetStore {
       );
     }
     for (const field of dateFields) {
-      granularitiesPerFields[field.fieldName].delete(field.granularity || "month");
+      granularitiesPerFields[field.fieldName].delete(field.granularity);
     }
     return granularitiesPerFields;
   }

tests/pivots/spreadsheet_pivot/spreadsheet_pivot_side_panel.test.ts

@@ -4,12 +4,13 @@ import {
   PIVOT_INSERT_TABLE_STYLE_ID,
   PIVOT_TOKEN_COLOR,
 } from "@odoo/o-spreadsheet-engine/constants";
+import { datetimeGranularities } from "@odoo/o-spreadsheet-engine/helpers/pivot/pivot_registry";
 import { SpreadsheetPivot } from "@odoo/o-spreadsheet-engine/helpers/pivot/spreadsheet_pivot/spreadsheet_pivot";
 import { SpreadsheetChildEnv } from "@odoo/o-spreadsheet-engine/types/spreadsheet_env";
 import { Model, PivotSortedColumn, SpreadsheetPivotTable } from "../../../src";
 import { SidePanels } from "../../../src/components/side_panel/side_panels/side_panels";
 import { toXC, toZone } from "../../../src/helpers";
-import { topbarMenuRegistry } from "../../../src/registries/menus";
+import { topbarMenuRegistry } from "../../../src/registries/menus/topbar_menu_registry";
 import { NotificationStore } from "../../../src/stores/notification_store";
 import {
   activateSheet,
@@ -575,6 +576,43 @@ describe("Spreadsheet pivot side panel", () => {
     ]);
   });
 
+  test("All granularities are displayed in order and not more than once", async () => {
+    setCellContent(model, "G1", "=PIVOT(1)"); // TODO: remove once task 4781740 is done
+    setCellContent(model, "A1", "Date");
+    setCellContent(model, "A2", "2023-01-01");
+    setCellContent(model, "A3", "2023-01-02");
+    updatePivot(model, "1", {
+      columns: [],
+      measures: [{ id: "Amount:sum", fieldName: "Amount", aggregator: "sum" }],
+    });
+    await nextTick();
+
+    for (let i = 0; i < datetimeGranularities.length; i++) {
+      await click(fixture.querySelector(".add-dimension")!);
+      await click(fixture.querySelectorAll(".o-autocomplete-value")[0]);
+    }
+
+    expect(model.getters.getPivotCoreDefinition("1").columns).toMatchObject([
+      { fieldName: "Date", granularity: "year" },
+      { fieldName: "Date", granularity: "quarter_number" },
+      { fieldName: "Date", granularity: "month_number" },
+      { fieldName: "Date", granularity: "month" },
+      { fieldName: "Date", granularity: "iso_week_number" },
+      { fieldName: "Date", granularity: "day_of_month" },
+      { fieldName: "Date", granularity: "day" },
+      { fieldName: "Date", granularity: "day_of_week" },
+      { fieldName: "Date", granularity: "hour_number" },
+      { fieldName: "Date", granularity: "minute_number" },
+      { fieldName: "Date", granularity: "second_number" },
+    ]);
+
+    await click(fixture.querySelector(".add-dimension")!);
+    const availableFields = [...fixture.querySelectorAll(".o-autocomplete-value")].map(
+      (el) => el.textContent
+    );
+    expect(availableFields).not.toContain("Date");
+  });
+
   test("Date dimensions with undefined granularity is correctly displayed as month", async () => {
     setCellContent(model, "G1", "=PIVOT(1)"); // TODO: remove once task 4781740 is done
     setCellContent(model, "A1", "Date");