[REF] web,mail: use patchMixin and patch instead of utils.patch

This commit replaces the use of utils.patch by the new class patcher and
makes the renderers that are converted to owl patchable.

closes odoo/odoo#47700

Related: odoo/enterprise#9551
Signed-off-by: Géry Debongnie (ged) <ged@openerp.com>

6 files changed, 12 insertions, 9 deletions

diff --git a/addons/mail/static/src/js/custom_filter_item.js b/addons/mail/static/src/js/custom_filter_item.js
index b828d0f44f6..abe15edab94 100644
--- a/addons/mail/static/src/js/custom_filter_item.js
+++ b/addons/mail/static/src/js/custom_filter_item.js
@@ -2,9 +2,8 @@ odoo.define('mail.CustomFilterItem', function (require) {
     "use strict";
 
     const CustomFilterItem = require('web.CustomFilterItem');
-    const utils = require('web.utils');
 
-    utils.patch(CustomFilterItem, 'mail.CustomFilterItem', {
+    CustomFilterItem.patch('mail.CustomFilterItem', T => class extends T {
 
         /**
          * With the `mail` module installed, we want to filter out some of the
@@ -12,10 +11,10 @@ odoo.define('mail.CustomFilterItem', function (require) {
          * @override
          */
         _validateField(field) {
-            return this._super(...arguments) &&
+            return super._validateField(...arguments) &&
                 field.relation !== 'mail.message' &&
                 field.name !== 'message_ids';
-        },
+        }
     });
 
     return CustomFilterItem;
diff --git a/addons/mail/static/src/js/views/activity/activity_renderer.js b/addons/mail/static/src/js/views/activity/activity_renderer.js
index 3e697dd11e6..40f2ef453b8 100644
--- a/addons/mail/static/src/js/views/activity/activity_renderer.js
+++ b/addons/mail/static/src/js/views/activity/activity_renderer.js
@@ -7,6 +7,7 @@ const ActivityRecord = require('mail.ActivityRecord');
 const { ComponentAdapter } = require('web.OwlCompatibility');
 const core = require('web.core');
 const KanbanColumnProgressBar = require('web.KanbanColumnProgressBar');
+const patchMixin = require('web.patchMixin');
 const QWeb = require('web.QWeb');
 const session = require('web.session');
 const utils = require('web.utils');
@@ -204,6 +205,6 @@ ActivityRenderer.components = {
 };
 ActivityRenderer.template = 'mail.ActivityRenderer';
 
-return ActivityRenderer;
+return patchMixin(ActivityRenderer);
 
 });
diff --git a/addons/web/static/src/js/control_panel/control_panel.js b/addons/web/static/src/js/control_panel/control_panel.js
index d7105806de4..fee26c3779d 100644
--- a/addons/web/static/src/js/control_panel/control_panel.js
+++ b/addons/web/static/src/js/control_panel/control_panel.js
@@ -6,6 +6,7 @@ odoo.define('web.ControlPanel', function (require) {
     const FavoriteMenu = require('web.FavoriteMenu');
     const FilterMenu = require('web.FilterMenu');
     const GroupByMenu = require('web.GroupByMenu');
+    const patchMixin = require('web.patchMixin');
     const Pager = require('web.Pager');
     const SearchBar = require('web.SearchBar');
     const TimeRangeMenu = require('web.TimeRangeMenu');
@@ -221,5 +222,5 @@ odoo.define('web.ControlPanel', function (require) {
 
     ControlPanel.template = 'web.ControlPanel';
 
-    return ControlPanel;
+    return patchMixin(ControlPanel);
 });
diff --git a/addons/web/static/src/js/control_panel/custom_filter_item.js b/addons/web/static/src/js/control_panel/custom_filter_item.js
index 40265e95fe2..b1f414eac5f 100644
--- a/addons/web/static/src/js/control_panel/custom_filter_item.js
+++ b/addons/web/static/src/js/control_panel/custom_filter_item.js
@@ -6,6 +6,7 @@ odoo.define('web.CustomFilterItem', function (require) {
     const DropdownMenuItem = require('web.DropdownMenuItem');
     const { FIELD_OPERATORS, FIELD_TYPES } = require('web.searchUtils');
     const field_utils = require('web.field_utils');
+    const patchMixin = require('web.patchMixin');
     const { useModel } = require('web.model');
 
     /**
@@ -254,5 +255,5 @@ odoo.define('web.CustomFilterItem', function (require) {
     };
     CustomFilterItem.template = 'web.CustomFilterItem';
 
-    return CustomFilterItem;
+    return patchMixin(CustomFilterItem);
 });
diff --git a/addons/web/static/src/js/core/utils.js b/addons/web/static/src/js/core/utils.js
index e8924747616..1e3c6074857 100644
--- a/addons/web/static/src/js/core/utils.js
+++ b/addons/web/static/src/js/core/utils.js
@@ -531,7 +531,7 @@ var utils = {
      * This function is the last resort solution for monkey-patching an
      * ES6 Class, for people that do not control the code defining the Class
      * to patch (e.g. partners), and when that Class isn't patchable already
-     * (i.e. when it doesn't have a 'patch' function, defined by the 'web.PatchMixin').
+     * (i.e. when it doesn't have a 'patch' function, defined by the 'web.patchMixin').
      * 
      * @param {Class} C Class to patch
      * @param {string} patchName
diff --git a/addons/web/static/src/js/views/pivot/pivot_renderer.js b/addons/web/static/src/js/views/pivot/pivot_renderer.js
index 3b91cb137d4..8335c7c29f5 100644
--- a/addons/web/static/src/js/views/pivot/pivot_renderer.js
+++ b/addons/web/static/src/js/views/pivot/pivot_renderer.js
@@ -3,6 +3,7 @@ odoo.define('web.PivotRenderer', function (require) {
 
     const OwlAbstractRenderer = require('web.AbstractRendererOwl');
     const field_utils = require('web.field_utils');
+    const patchMixin = require('web.patchMixin');
 
     const { useExternalListener, useState, onMounted, onPatched } = owl.hooks;
 
@@ -198,6 +199,6 @@ odoo.define('web.PivotRenderer', function (require) {
 
     PivotRenderer.template = 'web.PivotRenderer';
 
-    return PivotRenderer;
+    return patchMixin(PivotRenderer);
 
 });