From d3bc101177abb21912448d21d57ac7dc7de09b16 Mon Sep 17 00:00:00 2001
From: "Julien Carion (juca)" <juca@odoo.com>
Date: Fri, 6 Dec 2024 12:40:51 +0100
Subject: [PATCH] [FIX] devtools: fix observe variables

This commit solves issues with the observe variables functionality: it
first restricts refreshing the observed variables to when owl is loaded
on the page and then fixes how simplified paths are handled to find
components so that both type of path will work fine no matter from where
the function is called. This would cause issues when observing variables
from the observed state section.
---
 .../devtools/src/devtools_app/store/store.js  | 12 ++++++----
 .../page_scripts/owl_devtools_global_hook.js  | 23 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/tools/devtools/src/devtools_app/store/store.js b/tools/devtools/src/devtools_app/store/store.js
index b3df8132..a06ae253 100644
--- a/tools/devtools/src/devtools_app/store/store.js
+++ b/tools/devtools/src/devtools_app/store/store.js
@@ -694,11 +694,13 @@ async function init() {
   }, 500);
   // Refresh observed variables values every 200 ms
   setInterval(async () => {
-    store.observedVariables = await evalFunctionInWindow(
-      "getObservedVariables",
-      [[...store.observedVariables]],
-      store.activeFrame
-    );
+    if (store.owlStatus) {
+      store.observedVariables = await evalFunctionInWindow(
+        "getObservedVariables",
+        [[...store.observedVariables]],
+        store.activeFrame
+      );
+    }
   }, 200);
 }
 
diff --git a/tools/devtools/src/page_scripts/owl_devtools_global_hook.js b/tools/devtools/src/page_scripts/owl_devtools_global_hook.js
index 0fc0f9d4..da87b07f 100644
--- a/tools/devtools/src/page_scripts/owl_devtools_global_hook.js
+++ b/tools/devtools/src/page_scripts/owl_devtools_global_hook.js
@@ -740,8 +740,8 @@
 
     // Returns the asked property given its global path
     getObjectProperty(path) {
-      // Just return the corresponding app if path is of length 1
-      if (path.length === 1) {
+      // Just return the corresponding app if path is of length 1 and not simplified
+      if (path.length === 1 && !isNaN(path[0])) {
         return [...this.apps][path[0]];
       }
       // Path to the component node is only strings, becomes objects for properties
@@ -749,7 +749,7 @@
       if (index === -1) {
         return this.getComponentNode(path);
       }
-      const componentNode = this.getComponentNode(index === 1 ? path[0] : path.slice(0, index));
+      const componentNode = this.getComponentNode(index === 1 ? [path[0]] : path.slice(0, index));
       if (componentNode) {
         return this.getObject(componentNode, path.slice(index));
       }
@@ -1126,13 +1126,15 @@
     }
     // Returns the Component node given its path and the root component node
     getComponentNode(path) {
-      // The node is an app and not a component
-      if (path.length === 1) {
+      // All paths that consists in an array containing a single stringified number lead to an app
+      if (path.length === 1 && !isNaN(path[0])) {
         return [...this.apps][path[0]];
       }
-      // The second element in the path will always be the root of the app
-      let node = [...this.apps][path[0]]?.root;
-      if (path instanceof Array) {
+      let node;
+      // If the path is longer and its first item is indeed an app number, it is a regular path
+      if (!isNaN(path[0])) {
+        // The second element in the path will always be the root of the app
+        node = [...this.apps][path[0]]?.root;
         if (!node) {
           return null;
         }
@@ -1147,8 +1149,11 @@
             return null;
           }
         }
+        // If the first path item is a more complex string, it is a simplified path where elements
+        // are a series of component names and indexes separated by slashes
       } else {
-        const simplifiedPathArray = path.split("/");
+        const simplifiedPathArray = path[0].split("/");
+        node = [...this.apps][simplifiedPathArray[0]]?.root;
         if (node.name !== simplifiedPathArray[1]) {
           return null;
         }