This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push: new 7605f7a ATLAS-4243:UI: Legend in lineage gets duplicated. 7605f7a is described below commit 7605f7a6aee531ec82637edb2eec0aad3d24dc85 Author: prasad pawar <prasad.pa...@freestoneinfotech.com> AuthorDate: Tue Apr 27 12:21:11 2021 +0530 ATLAS-4243:UI: Legend in lineage gets duplicated. Signed-off-by: nixonrodrigues <ni...@apache.org> --- dashboardv2/public/js/views/graph/LineageLayoutView.js | 6 ++++-- dashboardv3/public/js/views/graph/LineageLayoutView.js | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js b/dashboardv2/public/js/views/graph/LineageLayoutView.js index bf80509..5ad657e 100644 --- a/dashboardv2/public/js/views/graph/LineageLayoutView.js +++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js @@ -215,7 +215,8 @@ define(['require', onSelectDepthChange: function(e, options) { //this.initializeGraph(); this.filterObj.depthCount = e.currentTarget.value; - this.fetchGraphData({ queryParam: { 'depth': this.filterObj.depthCount } }); + //legends property is added in queryParam to stop the legend getting added in lineage graph whenever dept is changed. + this.fetchGraphData({ queryParam: { 'depth': this.filterObj.depthCount }, 'legends': false }); }, onClickResetLineage: function() { this.LineageHelperRef.refresh(); @@ -252,7 +253,7 @@ define(['require', if (that.isDestroyed) { return; } - + data["legends"] = options ? options.legends : true; that.createGraph(data); that.renderLineageTypeSearch(data); }, @@ -274,6 +275,7 @@ define(['require', data: data, el: this.$('.svg')[0], legendsEl: this.$('.legends')[0], + legends: data.legends, getFilterObj: function() { return { isProcessHideCheck: that.filterObj.isProcessHideCheck, diff --git a/dashboardv3/public/js/views/graph/LineageLayoutView.js b/dashboardv3/public/js/views/graph/LineageLayoutView.js index bf80509..954d9af 100644 --- a/dashboardv3/public/js/views/graph/LineageLayoutView.js +++ b/dashboardv3/public/js/views/graph/LineageLayoutView.js @@ -215,7 +215,8 @@ define(['require', onSelectDepthChange: function(e, options) { //this.initializeGraph(); this.filterObj.depthCount = e.currentTarget.value; - this.fetchGraphData({ queryParam: { 'depth': this.filterObj.depthCount } }); + //legends property is added in queryParam to stop the legend getting added in lineage graph whenever dept is changed. + this.fetchGraphData({ queryParam: { 'depth': this.filterObj.depthCount }, 'legends': false }); }, onClickResetLineage: function() { this.LineageHelperRef.refresh(); @@ -252,7 +253,7 @@ define(['require', if (that.isDestroyed) { return; } - + data["legends"] = options ? options.legends : true; that.createGraph(data); that.renderLineageTypeSearch(data); }, @@ -268,12 +269,12 @@ define(['require', createGraph: function(data) { var that = this; $('.resizeGraph').css("height", this.$('.svg').height() + "px"); - this.LineageHelperRef = new LineageHelper.default({ entityDefCollection: this.entityDefCollection.fullCollection.toJSON(), data: data, el: this.$('.svg')[0], legendsEl: this.$('.legends')[0], + legends: data.legends, getFilterObj: function() { return { isProcessHideCheck: that.filterObj.isProcessHideCheck,