ATLAS-1395: Lineage improvement for tooltip Signed-off-by: Madhan Neethiraj <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/b305ba50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/b305ba50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/b305ba50 Branch: refs/heads/master Commit: b305ba5059997f043a47a7a8e802e6355bb5e31f Parents: edc4786 Author: kevalbhatt <[email protected]> Authored: Fri Dec 16 11:35:22 2016 +0530 Committer: Madhan Neethiraj <[email protected]> Committed: Fri Dec 16 06:50:25 2016 -0800 ---------------------------------------------------------------------- .../public/js/views/graph/LineageLayoutView.js | 24 ++++++++------------ release-log.txt | 2 ++ 2 files changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b305ba50/dashboardv2/public/js/views/graph/LineageLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js b/dashboardv2/public/js/views/graph/LineageLayoutView.js index d16674e..c1d860a 100644 --- a/dashboardv2/public/js/views/graph/LineageLayoutView.js +++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js @@ -141,20 +141,16 @@ define(['require', obj['shape'] = "img"; obj['typeName'] = relationObj.typeName obj['label'] = relationObj.displayText.trunc(18); - obj['toolTiplabel'] = relationObj.displayText; - if (obj.typeName) { - var temp = obj['label'] + ' (' + relationObj.typeName + ')'; - obj['toolTiplabel'] = temp - obj['label'] = temp.trunc(18); - } + obj['toolTipLabel'] = relationObj.displayText; obj['id'] = relationObj.guid; + obj['queryText'] = relationObj.queryText; if (relationObj.status) { obj['status'] = relationObj.status; } if (that.typeMap && that.typeMap[relationObj.typeName]) { obj['isProcess'] = _.contains(that.typeMap[relationObj.typeName], "Process") ? true : false; } else { - that.typeMap[relationObj.typeName] = { fetch: true } + that.typeMap[relationObj.typeName] = { fetch: true }; fetchEntity(relationObj.typeName); } return obj; @@ -303,7 +299,10 @@ define(['require', .attr('class', 'd3-tip') .html(function(d) { var value = that.g.node(d); - var htmlStr = "<h5>Name: <span style='color:#359f89'>" + value.toolTiplabel + "</span></h5> "; + var htmlStr = "<h5 class='text-center'><span style='color:#359f89'>" + value.toolTipLabel + "</span></h5> "; + if (value.typeName) { + htmlStr += "<h5 class='text-center'><span>(" + value.typeName + ")</span></h5> "; + } if (value.queryText) { htmlStr += "<h5>Query: <span style='color:#359f89'>" + value.queryText + "</span></h5> "; } @@ -318,22 +317,19 @@ define(['require', //change text postion svgGroup.selectAll("g.nodes g.label") .attr("transform", "translate(2,-30)"); - - svgGroup.selectAll("g.nodes image") - .on('mouseover', function(d) { + svgGroup.selectAll("g.nodes g.node") + .on('mouseenter', function(d) { tooltip.show(d); }) .on('dblclick', function(d) { tooltip.hide(d); - //var urlForTab = window.location.hash.split('/')[1]; - Utils.setUrl({ url: '#!/detailPage/' + d, mergeBrowserUrl: false, trigger: true }); }) - .on('mouseout', function(d) { + .on('mouseleave', function(d) { tooltip.hide(d); }); // Center the graph http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b305ba50/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 792b333..f63842f 100644 --- a/release-log.txt +++ b/release-log.txt @@ -9,6 +9,8 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai) ALL CHANGES: +ATLAS-1395 Lineage improvement for tooltip (kevalbhatt via mneethiraj) +ATLAS-1193 UI to create/update entities (Kalyanikashikar via mneethiraj) ATLAS-1304 Redundant code removal and code simplification (apoorvnaik via mneethiraj) ATLAS-1345 Enhance search APIs to resolve hierarchical references (apoorvnaik via sumasai) ATLAS-1287 Subtasks: ATLAS-1288/ATLAS-1289 Integrated V2 API for Lineage,Entity Details,Tag assign to entity,Tags listing,tag create (kevalbhatt)
