From 8fa2caa4a2f69650bef69394b31bb5a824412459 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Fri, 29 Jul 2022 07:19:13 +0200 Subject: [PATCH] fix: return promise (#17646) --- frappe/public/js/frappe/ui/tree.js | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/frappe/public/js/frappe/ui/tree.js b/frappe/public/js/frappe/ui/tree.js index c32d92aa32..4b2c0bc12b 100644 --- a/frappe/public/js/frappe/ui/tree.js +++ b/frappe/public/js/frappe/ui/tree.js @@ -134,7 +134,7 @@ frappe.ui.Tree = class { } reload_node(node) { - this.load_children(node); + return this.load_children(node); } toggle() { @@ -150,21 +150,20 @@ frappe.ui.Tree = class { } load_children(node, deep=false) { - let lab = node.label, value = node.data.value, is_root = node.is_root; + const value = node.data.value, + is_root = node.is_root; - if(!deep) { - frappe.run_serially([ + return deep + ? frappe.run_serially([ + () => this.get_all_nodes(value, is_root, node.label), + data_list => this.render_children_of_all_nodes(data_list), + () => this.set_selected_node(node), + ]) + : frappe.run_serially([ () => this.get_nodes(value, is_root), - (data_set) => this.render_node_children(node, data_set), - () => this.set_selected_node(node) + data_set => this.render_node_children(node, data_set), + () => this.set_selected_node(node), ]); - } else { - frappe.run_serially([ - () => this.get_all_nodes(value, is_root, lab), - (data_list) => this.render_children_of_all_nodes(data_list), - () => this.set_selected_node(node) - ]); - } } render_children_of_all_nodes(data_list) {