[IMP] spreadsheet: update helpers to cache clickable cells

Following odoo/o-spreadsheet#4090, Some helpers are adapted to suit their use with the clickable cell refactoring. task-3869752
odoo-dev · May 14, 2024 · 88ed634 · 88ed634
1 parent 7202d55
commit 88ed634
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/addons/spreadsheet/static/src/list/index.js b/addons/spreadsheet/static/src/list/index.js
@@ -42,7 +42,7 @@ cellMenuRegistry.add(
         },
         isVisible: (env) => {
             const position = env.model.getters.getActivePosition();
-            return SEE_RECORD_LIST_VISIBLE(position, env);
+            return SEE_RECORD_LIST_VISIBLE(position, env.model.getters);
         },
         icon: "o-spreadsheet-Icon.SEE_RECORDS",
     })

diff --git a/addons/spreadsheet/static/src/list/list_actions.js b/addons/spreadsheet/static/src/list/list_actions.js
@@ -46,12 +46,12 @@ export const SEE_RECORD_LIST = async (position, env) => {
 
 /**
  * @param {import("@odoo/o-spreadsheet").CellPosition} position
- * @param {import("@spreadsheet").SpreadsheetChildEnv} env
+ * @param {import("@spreadsheet").OdooGetters} getters
  * @returns {boolean}
  */
-export const SEE_RECORD_LIST_VISIBLE = (position, env) => {
-    const evaluatedCell = env.model.getters.getEvaluatedCell(position);
-    const cell = env.model.getters.getCell(position);
+export const SEE_RECORD_LIST_VISIBLE = (position, getters) => {
+    const evaluatedCell = getters.getEvaluatedCell(position);
+    const cell = getters.getCell(position);
     return (
         evaluatedCell.type !== "empty" &&
         evaluatedCell.type !== "error" &&

diff --git a/addons/spreadsheet/static/src/pivot/index.js b/addons/spreadsheet/static/src/pivot/index.js
@@ -30,7 +30,7 @@ cellMenuRegistry.add("pivot_see_records", {
     },
     isVisible: (env) => {
         const position = env.model.getters.getActivePosition();
-        return SEE_RECORDS_PIVOT_VISIBLE(position, env);
+        return SEE_RECORDS_PIVOT_VISIBLE(position, env.model.getters);
     },
     icon: "o-spreadsheet-Icon.SEE_RECORDS",
 });

diff --git a/addons/spreadsheet/static/src/pivot/pivot_actions.js b/addons/spreadsheet/static/src/pivot/pivot_actions.js
@@ -38,13 +38,13 @@ export const SEE_RECORDS_PIVOT = async (position, env) => {
 
 /**
  * @param {import("@odoo/o-spreadsheet").CellPosition} position
- * @param {import("@spreadsheet").SpreadsheetChildEnv} env
+ * @param {import("@spreadsheet").OdooGetters} getters
  * @returns {boolean}
  */
-export const SEE_RECORDS_PIVOT_VISIBLE = (position, env) => {
-    const cell = env.model.getters.getCorrespondingFormulaCell(position);
-    const evaluatedCell = env.model.getters.getEvaluatedCell(position);
-    const argsDomain = env.model.getters.getPivotDomainArgsFromPosition(position);
+export const SEE_RECORDS_PIVOT_VISIBLE = (position, getters) => {
+    const cell = getters.getCorrespondingFormulaCell(position);
+    const evaluatedCell = getters.getEvaluatedCell(position);
+    const argsDomain = getters.getPivotDomainArgsFromPosition(position);
     return (
         evaluatedCell.type !== "empty" &&
         evaluatedCell.type !== "error" &&
@@ -64,18 +64,18 @@ export const SEE_RECORDS_PIVOT_VISIBLE = (position, env) => {
  *
  * @returns {boolean}
  */
-export function SET_FILTER_MATCHING_CONDITION(position, env) {
-    if (!SEE_RECORDS_PIVOT_VISIBLE(position, env)) {
+export function SET_FILTER_MATCHING_CONDITION(position, getters) {
+    if (!SEE_RECORDS_PIVOT_VISIBLE(position, getters)) {
         return false;
     }
-    const cell = env.model.getters.getCorrespondingFormulaCell(position);
+    const cell = getters.getCorrespondingFormulaCell(position);
 
-    const pivotId = env.model.getters.getPivotIdFromPosition(position);
-    const domainArgs = env.model.getters.getPivotDomainArgsFromPosition(position);
+    const pivotId = getters.getPivotIdFromPosition(position);
+    const domainArgs = getters.getPivotDomainArgsFromPosition(position);
     if (domainArgs === undefined) {
         return false;
     }
-    const matchingFilters = env.model.getters.getFiltersMatchingPivotArgs(pivotId, domainArgs);
+    const matchingFilters = getters.getFiltersMatchingPivotArgs(pivotId, domainArgs);
     const pivotFunction = getFirstPivotFunction(cell.compiledFormula.tokens).functionName;
     return (
         (pivotFunction === "PIVOT.VALUE" ||