NextERP/owl
2
0
Fork 0
mirror of https://github.com/odoo/owl.git synced 2025-10-06 19:59:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] devtools: fix observe variables

Browse Source 
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.
This commit is contained in:
Julien Carion (juca)
2024-12-06 12:40:51 +01:00
committed by Michaël Mattiello
parent 4287beae19
commit d3bc101177
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/devtools/src/devtools_app/store/store.js
+7 -5
View File
@@ -694,11 +694,13 @@ async function init() {
}, 500); }, 500);
// Refresh observed variables values every 200 ms // Refresh observed variables values every 200 ms
setInterval(async () => { setInterval(async () => {
store.observedVariables = await evalFunctionInWindow( if (store.owlStatus) {
"getObservedVariables", store.observedVariables = await evalFunctionInWindow(
[[...store.observedVariables]], "getObservedVariables",
store.activeFrame [[...store.observedVariables]],
); store.activeFrame
);
}
}, 200); }, 200);
} }
tools/devtools/src/page_scripts/owl_devtools_global_hook.js
+14 -9
View File
@@ -740,8 +740,8 @@
// Returns the asked property given its global path // Returns the asked property given its global path
getObjectProperty(path) { getObjectProperty(path) {
// Just return the corresponding app if path is of length 1 // Just return the corresponding app if path is of length 1 and not simplified
if (path.length === 1) { if (path.length === 1 && !isNaN(path[0])) {
return [...this.apps][path[0]]; return [...this.apps][path[0]];
} }
// Path to the component node is only strings, becomes objects for properties // Path to the component node is only strings, becomes objects for properties
@@ -749,7 +749,7 @@
if (index === -1) { if (index === -1) {
return this.getComponentNode(path); 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) { if (componentNode) {
return this.getObject(componentNode, path.slice(index)); return this.getObject(componentNode, path.slice(index));
} }
@@ -1126,13 +1126,15 @@
} }
// Returns the Component node given its path and the root component node // Returns the Component node given its path and the root component node
getComponentNode(path) { getComponentNode(path) {
// The node is an app and not a component // All paths that consists in an array containing a single stringified number lead to an app
if (path.length === 1) { if (path.length === 1 && !isNaN(path[0])) {
return [...this.apps][path[0]]; return [...this.apps][path[0]];
} }
// The second element in the path will always be the root of the app let node;
let node = [...this.apps][path[0]]?.root; // If the path is longer and its first item is indeed an app number, it is a regular path
if (path instanceof Array) { 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) { if (!node) {
return null; return null;
} }
@@ -1147,8 +1149,11 @@
return null; 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 { } else {
const simplifiedPathArray = path.split("/"); const simplifiedPathArray = path[0].split("/");
node = [...this.apps][simplifiedPathArray[0]]?.root;
if (node.name !== simplifiedPathArray[1]) { if (node.name !== simplifiedPathArray[1]) {
return null; return null;
} }