From 590957106ba03823e1e2cfea1aa2cd0469cbe479 Mon Sep 17 00:00:00 2001
From: Pierre Rousseau <pro@odoo.com>
Date: Sat, 8 Oct 2022 06:55:47 +0000
Subject: [PATCH] [FIX] spreadsheet: rename conflicting getter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#102706

Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
---
 .../components/filter_value/filter_value.xml          |  2 +-
 .../plugins/global_filters_ui_plugin.js               | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/spreadsheet/static/src/global_filters/components/filter_value/filter_value.xml b/addons/spreadsheet/static/src/global_filters/components/filter_value/filter_value.xml
index fdbfe0f5f1a..138d337f506 100644
--- a/addons/spreadsheet/static/src/global_filters/components/filter_value/filter_value.xml
+++ b/addons/spreadsheet/static/src/global_filters/components/filter_value/filter_value.xml
@@ -41,7 +41,7 @@
                     </t>
                 </select>
             </div>
-            <i t-if="getters.isFilterActive(filter.id)"
+            <i t-if="getters.isGlobalFilterActive(filter.id)"
                 class="fa fa-times btn btn-link text-muted o_side_panel_filter_icon ms-1"
                 title="Clear"
                 t-on-click="() => this.onClear(filter.id)"/>
diff --git a/addons/spreadsheet/static/src/global_filters/plugins/global_filters_ui_plugin.js b/addons/spreadsheet/static/src/global_filters/plugins/global_filters_ui_plugin.js
index 9994681f70b..1345b24d538 100644
--- a/addons/spreadsheet/static/src/global_filters/plugins/global_filters_ui_plugin.js
+++ b/addons/spreadsheet/static/src/global_filters/plugins/global_filters_ui_plugin.js
@@ -169,7 +169,7 @@ export default class GlobalFiltersUIPlugin extends spreadsheet.UIPlugin {
      *
      * @returns { boolean } true if the given filter is active
      */
-    isFilterActive(id) {
+    isGlobalFilterActive(id) {
         const { type } = this.getters.getGlobalFilter(id);
         const value = this.getGlobalFilterValue(id);
         switch (type) {
@@ -191,8 +191,9 @@ export default class GlobalFiltersUIPlugin extends spreadsheet.UIPlugin {
      * @returns {number}
      */
     getActiveFilterCount() {
-        return this.getters.getGlobalFilters().filter((filter) => this.isFilterActive(filter.id))
-            .length;
+        return this.getters
+            .getGlobalFilters()
+            .filter((filter) => this.isGlobalFilterActive(filter.id)).length;
     }
 
     getFilterDisplayValue(filterName) {
@@ -322,7 +323,7 @@ export default class GlobalFiltersUIPlugin extends spreadsheet.UIPlugin {
      * @returns {Domain|undefined}
      */
     _getDateDomain(filter, fieldMatching) {
-        if (!this.isFilterActive(filter.id)) {
+        if (!this.isGlobalFilterActive(filter.id)) {
             return undefined;
         }
         let granularity;
@@ -454,5 +455,5 @@ GlobalFiltersUIPlugin.getters = [
     "getGlobalFilterDomain",
     "getGlobalFilterValue",
     "getActiveFilterCount",
-    "isFilterActive",
+    "isGlobalFilterActive",
 ];