Skip to content

Commit

Permalink
fix(Org Chart): use attribute selectors instead of ID selector for no…
Browse files Browse the repository at this point in the history 
…de IDs with special characters (#27717)

* fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars

* fix: UI tests

(cherry picked from commit 9e08229)
  • Loading branch information
@ruchamahabal
ruchamahabal authored and mergify-bot committed Sep 30, 2021
1 parent 348f082 commit 1fcec79
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion cypress/integration/test_organizational_chart_desktop.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ context('Organizational Chart', () => {

it('navigates to org chart', () => {
cy.visit('/app');
cy.awesomebar('Organizational Chart');
cy.visit('/app/organizational-chart');
cy.url().should('include', '/organizational-chart');

cy.window().its('frappe.csrf_token').then(csrf_token => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/test_organizational_chart_mobile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ context('Organizational Chart Mobile', () => {
it('navigates to org chart', () => {
cy.viewport(375, 667);
cy.visit('/app');
cy.awesomebar('Organizational Chart');
cy.visit('/app/organizational-chart');
cy.url().should('include', '/organizational-chart');

cy.window().its('frappe.csrf_token').then(csrf_token => {
Expand Down
24 changes: 12 additions & 12 deletions erpnext/public/js/hierarchy_chart/hierarchy_chart_desktop.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ erpnext.HierarchyChart = class {
});

node.parent.append(node_card);
node.$link = $(`#${node.id}`);
node.$link = $(`[id="${node.id}"]`);
}

show() {
Expand Down Expand Up @@ -223,7 +223,7 @@ erpnext.HierarchyChart = class {
let node = undefined;

$.each(r.message, (_i, data) => {
if ($(`#${data.id}`).length)
if ($(`[id="${data.id}"]`).length)
return;

node = new me.Node({
Expand Down Expand Up @@ -263,7 +263,7 @@ erpnext.HierarchyChart = class {
this.refresh_connectors(node.parent_id);

// rebuild incoming connections
let grandparent = $(`#${node.parent_id}`).attr('data-parent');
let grandparent = $(`[id="${node.parent_id}"]`).attr('data-parent');
this.refresh_connectors(grandparent);
}

Expand All @@ -282,7 +282,7 @@ erpnext.HierarchyChart = class {

show_active_path(node) {
// mark node parent on active path
$(`#${node.parent_id}`).addClass('active-path');
$(`[id="${node.parent_id}"]`).addClass('active-path');
}

load_children(node, deep=false) {
Expand Down Expand Up @@ -317,7 +317,7 @@ erpnext.HierarchyChart = class {

render_child_nodes(node, child_nodes) {
const last_level = this.$hierarchy.find('.level:last').index();
const current_level = $(`#${node.id}`).parent().parent().parent().index();
const current_level = $(`[id="${node.id}"]`).parent().parent().parent().index();

if (last_level === current_level) {
this.$hierarchy.append(`
Expand Down Expand Up @@ -382,7 +382,7 @@ erpnext.HierarchyChart = class {
node.$children = $('<ul class="node-children"></ul>');

const last_level = this.$hierarchy.find('.level:last').index();
const node_level = $(`#${node.id}`).parent().parent().parent().index();
const node_level = $(`[id="${node.id}"]`).parent().parent().parent().index();

if (last_level === node_level) {
this.$hierarchy.append(`
Expand Down Expand Up @@ -489,7 +489,7 @@ erpnext.HierarchyChart = class {
set_path_attributes(path, parent_id, child_id) {
path.setAttribute("data-parent", parent_id);
path.setAttribute("data-child", child_id);
const parent = $(`#${parent_id}`);
const parent = $(`[id="${parent_id}"]`);

if (parent.hasClass('active')) {
path.setAttribute("class", "active-connector");
Expand All @@ -513,7 +513,7 @@ erpnext.HierarchyChart = class {
}

collapse_previous_level_nodes(node) {
let node_parent = $(`#${node.parent_id}`);
let node_parent = $(`[id="${node.parent_id}"]`);
let previous_level_nodes = node_parent.parent().parent().children('li');
let node_card = undefined;

Expand Down Expand Up @@ -545,7 +545,7 @@ erpnext.HierarchyChart = class {

setup_node_click_action(node) {
let me = this;
let node_element = $(`#${node.id}`);
let node_element = $(`[id="${node.id}"]`);

node_element.click(function() {
const is_sibling = me.selected_node.parent_id === node.parent_id;
Expand All @@ -563,7 +563,7 @@ erpnext.HierarchyChart = class {
}

setup_edit_node_action(node) {
let node_element = $(`#${node.id}`);
let node_element = $(`[id="${node.id}"]`);
let me = this;

node_element.find('.btn-edit-node').click(function() {
Expand All @@ -572,7 +572,7 @@ erpnext.HierarchyChart = class {
}

remove_levels_after_node(node) {
let level = $(`#${node.id}`).parent().parent().parent().index();
let level = $(`[id="${node.id}"]`).parent().parent().parent().index();

level = $('.hierarchy > li:eq('+ level + ')');
level.nextAll('li').remove();
Expand All @@ -595,7 +595,7 @@ erpnext.HierarchyChart = class {
const parent = $(path).data('parent');
const child = $(path).data('child');

if ($(`#${parent}`).length && $(`#${child}`).length)
if ($(`[id="${parent}"]`).length && $(`[id="${child}"]`).length)
return;

$(path).remove();
Expand Down
22 changes: 11 additions & 11 deletions erpnext/public/js/hierarchy_chart/hierarchy_chart_mobile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ erpnext.HierarchyChartMobile = class {
});

node.parent.append(node_card);
node.$link = $(`#${node.id}`);
node.$link = $(`[id="${node.id}"]`);
node.$link.addClass('mobile-node');
}

Expand Down Expand Up @@ -184,7 +184,7 @@ erpnext.HierarchyChartMobile = class {
this.refresh_connectors(node.parent_id, node.id);

// rebuild incoming connections of parent
let grandparent = $(`#${node.parent_id}`).attr('data-parent');
let grandparent = $(`[id="${node.parent_id}"]`).attr('data-parent');
this.refresh_connectors(grandparent, node.parent_id);
}

Expand Down Expand Up @@ -221,7 +221,7 @@ erpnext.HierarchyChartMobile = class {

show_active_path(node) {
// mark node parent on active path
$(`#${node.parent_id}`).addClass('active-path');
$(`[id="${node.parent_id}"]`).addClass('active-path');
}

load_children(node) {
Expand Down Expand Up @@ -256,7 +256,7 @@ erpnext.HierarchyChartMobile = class {
if (child_nodes) {
$.each(child_nodes, (_i, data) => {
this.add_node(node, data);
$(`#${data.id}`).addClass('active-child');
$(`[id="${data.id}"]`).addClass('active-child');

setTimeout(() => {
this.add_connector(node.id, data.id);
Expand Down Expand Up @@ -293,9 +293,9 @@ erpnext.HierarchyChartMobile = class {

let connector = undefined;

if ($(`#${parent_id}`).hasClass('active')) {
if ($(`[id="${parent_id}"]`).hasClass('active')) {
connector = this.get_connector_for_active_node(parent_node, child_node);
} else if ($(`#${parent_id}`).hasClass('active-path')) {
} else if ($(`[id="${parent_id}"]`).hasClass('active-path')) {
connector = this.get_connector_for_collapsed_node(parent_node, child_node);
}

Expand Down Expand Up @@ -351,7 +351,7 @@ erpnext.HierarchyChartMobile = class {
set_path_attributes(path, parent_id, child_id) {
path.setAttribute("data-parent", parent_id);
path.setAttribute("data-child", child_id);
const parent = $(`#${parent_id}`);
const parent = $(`[id="${parent_id}"]`);

if (parent.hasClass('active')) {
path.setAttribute("class", "active-connector");
Expand All @@ -374,7 +374,7 @@ erpnext.HierarchyChartMobile = class {

setup_node_click_action(node) {
let me = this;
let node_element = $(`#${node.id}`);
let node_element = $(`[id="${node.id}"]`);

node_element.click(function() {
let el = undefined;
Expand All @@ -398,7 +398,7 @@ erpnext.HierarchyChartMobile = class {
}

setup_edit_node_action(node) {
let node_element = $(`#${node.id}`);
let node_element = $(`[id="${node.id}"]`);
let me = this;

node_element.find('.btn-edit-node').click(function() {
Expand Down Expand Up @@ -512,7 +512,7 @@ erpnext.HierarchyChartMobile = class {
}

remove_levels_after_node(node) {
let level = $(`#${node.id}`).parent().parent().index();
let level = $(`[id="${node.id}"]`).parent().parent().index();

level = $('.hierarchy-mobile > li:eq('+ level + ')');
level.nextAll('li').remove();
Expand All @@ -533,7 +533,7 @@ erpnext.HierarchyChartMobile = class {
const parent = $(path).data('parent');
const child = $(path).data('child');

if ($(`#${parent}`).length && $(`#${child}`).length)
if ($(`[id="${parent}"]`).length && $(`[id="${child}"]`).length)
return;

$(path).remove();
Expand Down
2 changes: 2 additions & 0 deletions erpnext/tests/ui_test_helpers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ def create_employee_records():
create_company()
create_missing_designation()

frappe.db.sql("DELETE FROM tabEmployee WHERE company='Test Org Chart'")

emp1 = create_employee('Test Employee 1', 'CEO')
emp2 = create_employee('Test Employee 2', 'CTO')
emp3 = create_employee('Test Employee 3', 'Head of Marketing and Sales', emp1)
Expand Down

0 comments on commit 1fcec79

Please sign in to comment.