From 324c5ea02d9d3dd3bb6b86d9c71ff221afa93b78 Mon Sep 17 00:00:00 2001
From: Taras Shabaranskyi <shabaranskij@gmail.com>
Date: Sun, 21 Jul 2024 02:51:21 +0300
Subject: [PATCH] [FIX] web_refresher: new record refresh

---
 .../static/src/js/control_panel.esm.js        | 23 ++++++++++++-------
 web_refresher/static/src/js/refresher.esm.js  |  4 ++--
 .../static/src/xml/control_panel.xml          |  8 +++----
 .../static/src/xml/form_control_panel.xml     |  4 ++--
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/web_refresher/static/src/js/control_panel.esm.js b/web_refresher/static/src/js/control_panel.esm.js
index 2a63c2fd6..63fa99d56 100644
--- a/web_refresher/static/src/js/control_panel.esm.js
+++ b/web_refresher/static/src/js/control_panel.esm.js
@@ -12,16 +12,23 @@ ControlPanel.components = Object.assign({}, ControlPanel.components, {
     Refresher,
 });
 
+/**
+ * @property {String[]} forbiddenSubTypes
+ * @property {Object<String, *>} refresherProps
+ */
 patch(ControlPanel.prototype, "web_refresher.ControlPanel", {
     setup() {
         this._super(...arguments);
-        const {config, searchModel} = this.env;
-        const forbiddenSubType = ["base_settings"];
-        if (!forbiddenSubType.includes(config.viewSubType)) {
-            this.refresherProps = {
-                searchModel: searchModel,
-                pagerProps: this.pagerProps,
-            };
-        }
+        this.forbiddenSubTypes = ["base_settings"];
+        this.refresherProps = {
+            searchModel: this.env.searchModel,
+            pagerProps: this.pagerProps,
+        };
+    },
+    /**
+     * @returns {Boolean}
+     */
+    get displayRefresher() {
+        return !this.forbiddenSubTypes.includes(this.env.config.viewSubType);
     },
 });
diff --git a/web_refresher/static/src/js/refresher.esm.js b/web_refresher/static/src/js/refresher.esm.js
index 4a519eba5..9b9db3726 100644
--- a/web_refresher/static/src/js/refresher.esm.js
+++ b/web_refresher/static/src/js/refresher.esm.js
@@ -89,9 +89,9 @@ export class Refresher extends Component {
      * @returns {Promise<Boolean>}
      */
     async refresh() {
-        let updated = this._searchModelRefresh();
+        let updated = await this._pagerRefresh();
         if (!updated) {
-            updated = await this._pagerRefresh();
+            updated = this._searchModelRefresh();
         }
         return updated;
     }
diff --git a/web_refresher/static/src/xml/control_panel.xml b/web_refresher/static/src/xml/control_panel.xml
index ca9ef5127..aadcf133b 100644
--- a/web_refresher/static/src/xml/control_panel.xml
+++ b/web_refresher/static/src/xml/control_panel.xml
@@ -10,7 +10,7 @@
     >
         <xpath expr="//div[hasclass('o_cp_pager')]" position="before">
             <div class="oe_cp_refresher" role="search" t-ref="refresher">
-                <Refresher t-props="refresherProps" />
+                <Refresher t-if="displayRefresher" t-props="refresherProps" />
             </div>
         </xpath>
         <xpath expr="//div[hasclass('o_cp_bottom_right')]" position="before">
@@ -19,7 +19,7 @@
                 class="o_cp_bottom_right d-flex flex-row-reverse"
             >
                 <div class="oe_cp_refresher" role="search" t-ref="refresher">
-                    <Refresher refresherReport="true" />
+                    <Refresher t-if="displayRefresher" refresherReport="true" />
                 </div>
             </div>
         </xpath>
@@ -32,7 +32,7 @@
     >
         <xpath expr="//div[hasclass('o_cp_pager')]" position="before">
             <div class="oe_cp_refresher" role="search" t-ref="refresher">
-                <Refresher t-props="refresherProps" />
+                <Refresher t-if="displayRefresher" t-props="refresherProps" />
             </div>
         </xpath>
         <xpath expr="//div[hasclass('o_cp_bottom_right')]" position="before">
@@ -41,7 +41,7 @@
                 class="o_cp_bottom_right d-flex flex-row-reverse"
             >
                 <div class="oe_cp_refresher" role="search" t-ref="refresher">
-                    <Refresher refresherReport="true" />
+                    <Refresher t-if="displayRefresher" refresherReport="true" />
                 </div>
             </div>
         </xpath>
diff --git a/web_refresher/static/src/xml/form_control_panel.xml b/web_refresher/static/src/xml/form_control_panel.xml
index 0d9a88191..ed57a5ee6 100644
--- a/web_refresher/static/src/xml/form_control_panel.xml
+++ b/web_refresher/static/src/xml/form_control_panel.xml
@@ -10,7 +10,7 @@
     >
         <xpath expr="//div[hasclass('o_cp_pager')]" position="before">
             <div class="oe_cp_refresher" role="search" t-ref="refresher">
-                <Refresher t-props="refresherProps" />
+                <Refresher t-if="displayRefresher" t-props="refresherProps" />
             </div>
         </xpath>
         <xpath expr="//div[hasclass('o_cp_bottom_right')]" position="before">
@@ -19,7 +19,7 @@
                 class="o_cp_bottom_right d-flex flex-row-reverse"
             >
                 <div class="oe_cp_refresher" role="search" t-ref="refresher">
-                    <Refresher refresherReport="true" />
+                    <Refresher t-if="displayRefresher" refresherReport="true" />
                 </div>
             </div>
         </xpath>