MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity

Convert node click into label click if needed

megaRefact
Sami Mokaddem 2018-08-22 14:39:45 +00:00
parent 90b4ad28c1
commit 154835f9eb
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
static/js/treeFromJson.js
View File

@ -234,7 +234,7 @@
// setup onclick on link label // setup onclick on link label
if (this.options.interaction) { if (this.options.interaction) {
linkEnter.on("click", function(d, i) { linkEnter.on("click", function(d, i) {
that.clickLabel(d, i, this); that.clickLabel(d);
}); });
} }
@ -334,10 +334,24 @@
return c1 && c2; return c1 && c2;
}); });
} else { } else {
res = d3.selectAll(".node circle") // check if children is leaf
.filter(function(d) { var child = clicked.data()[0].children[0];
return d.parent !== null && d.parent.id == clicked.data()[0].id; if (that.isObject(child) || Array.isArray(child)) {
// First child is not a node, should highlight the label instead
// --> simulate label click
let source = clicked.data()[0];
let target = clicked.data()[0].children[0];
var resL = this.svg.selectAll("path.link").filter(function(d) {
return d.source.id == source.id && d.target.id == target.id;
}); });
that.clickLabel(resL.data()[0]);
return;
} else {
res = d3.selectAll(".node circle")
.filter(function(d) {
return d.parent !== null && d.parent.id == clicked.data()[0].id;
});
}
} }
res.data().forEach(function(elem) { res.data().forEach(function(elem) {
@ -364,18 +378,15 @@
this.add_instruction(instructions); this.add_instruction(instructions);
}, },
clickLabel: function(d, i, clickedContext) { clickLabel: function(d) {
var u_id = d.source.id + '-' + d.target.id; var u_id = d.source.id + '-' + d.target.id;
var l_id = '#'+u_id; var l_id = '#'+u_id;
var link_html = d3.select($(l_id));
console.log(clickedContext);
var that = this; var that = this;
var o_depth = d.source.depth; var o_depth = d.source.depth;
var dest_depth = d.target.depth; var dest_depth = d.target.depth;
var c_id = d.source.id; var c_id = d.source.id;
var c_index; // no index as the index is the label itself var c_index; // no index as the index is the label itself
var clicked = d3.select(clickedContext);
var itemColor = this.itemColors.get(this.currentPicking); var itemColor = this.itemColors.get(this.currentPicking);
this.reset_selected(); this.reset_selected();