fix: Org Chart fixes (#26952)
* fix: add z-index to filter to avoid svg wrapper overlapping
* fix: expand all nodes not working when there are only 2 levels
- added dom freeze while expanding all nodes and exporting
diff --git a/erpnext/hr/page/organizational_chart/organizational_chart.py b/erpnext/hr/page/organizational_chart/organizational_chart.py
index 1e03e3d..2983198 100644
--- a/erpnext/hr/page/organizational_chart/organizational_chart.py
+++ b/erpnext/hr/page/organizational_chart/organizational_chart.py
@@ -32,16 +32,17 @@
def get_connections(employee):
num_connections = 0
- connections = frappe.get_list('Employee', filters=[
+ nodes_to_expand = frappe.get_list('Employee', filters=[
['reports_to', '=', employee]
])
- num_connections += len(connections)
+ num_connections += len(nodes_to_expand)
- while connections:
- for entry in connections:
- connections = frappe.get_list('Employee', filters=[
- ['reports_to', '=', entry.name]
- ])
- num_connections += len(connections)
+ while nodes_to_expand:
+ parent = nodes_to_expand.pop(0)
+ descendants = frappe.get_list('Employee', filters=[
+ ['reports_to', '=', parent.name]
+ ])
+ num_connections += len(descendants)
+ nodes_to_expand.extend(descendants)
return num_connections
\ No newline at end of file
diff --git a/erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js b/erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
index 89fb8d5..da050ab 100644
--- a/erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
+++ b/erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
@@ -98,10 +98,12 @@
company.refresh();
$(`[data-fieldname="company"]`).trigger('change');
+ $(`[data-fieldname="company"] .link-field`).css('z-index', 2);
}
setup_actions() {
let me = this;
+ this.page.clear_inner_toolbar();
this.page.add_inner_button(__('Export'), function() {
me.export_chart();
});
@@ -123,6 +125,7 @@
}
export_chart() {
+ frappe.dom.freeze(__('Exporting...'));
this.page.main.css({
'min-height': '',
'max-height': '',
@@ -146,6 +149,8 @@
a.href = dataURL;
a.download = 'hierarchy_chart';
a.click();
+ }).finally(() => {
+ frappe.dom.unfreeze();
});
this.setup_page_style();
@@ -169,7 +174,9 @@
this.page.main
.find('#hierarchy-chart-wrapper')
.append(this.$hierarchy);
+
this.nodes = {};
+ this.all_nodes_expanded = false;
}
make_svg_markers() {
@@ -202,7 +209,7 @@
render_root_nodes(expanded_view=false) {
let me = this;
- frappe.call({
+ return frappe.call({
method: me.method,
args: {
company: me.company
@@ -229,8 +236,8 @@
expand_node = node;
});
+ me.root_node = expand_node;
if (!expanded_view) {
- me.root_node = expand_node;
me.expand_node(expand_node);
}
}
@@ -280,10 +287,12 @@
]);
} else {
frappe.run_serially([
+ () => frappe.dom.freeze(),
() => this.setup_hierarchy(),
() => this.render_root_nodes(true),
() => this.get_all_nodes(node.id, node.name),
- (data_list) => this.render_children_of_all_nodes(data_list)
+ (data_list) => this.render_children_of_all_nodes(data_list),
+ () => frappe.dom.unfreeze()
]);
}
}
@@ -359,7 +368,7 @@
node = this.nodes[entry.parent];
if (node) {
this.render_child_nodes_for_expanded_view(node, entry.data);
- } else {
+ } else if (data_list.length) {
data_list.push(entry);
}
}