atlas git commit: ATLAS-2917: Filter added for Lineage to hide Process entity. [Forced Update!]
Repository: atlas Updated Branches: refs/heads/branch-1.0 14cb82d72 -> 66bf4164c (forced update) ATLAS-2917: Filter added for Lineage to hide Process entity. (cherry picked from commit c2a2ec426eac66702cf9ba20a08d634469d78e48) Signed-off-by: Sarath Subramanian Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/66bf4164 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/66bf4164 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/66bf4164 Branch: refs/heads/branch-1.0 Commit: 66bf4164c5e62071f441022d1aa2238daaee0e81 Parents: de172af Author: kevalbhatt Authored: Sun Oct 14 12:00:58 2018 -0700 Committer: Sarath Subramanian Committed: Sun Oct 14 12:08:37 2018 -0700 -- dashboardv2/public/css/scss/graph.scss | 14 ++- .../templates/graph/LineageLayoutView_tmpl.html | 21 +++- .../public/js/views/graph/LineageLayoutView.js | 108 +++ 3 files changed, 115 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/66bf4164/dashboardv2/public/css/scss/graph.scss -- diff --git a/dashboardv2/public/css/scss/graph.scss b/dashboardv2/public/css/scss/graph.scss index 5784095..3fce69d 100644 --- a/dashboardv2/public/css/scss/graph.scss +++ b/dashboardv2/public/css/scss/graph.scss @@ -152,11 +152,9 @@ g.type-TK>rect { fill: $color_bright_turquoise_approx; } -.zoomButtonGroup { -background-color: $white; +.hideProcessContainer { position: absolute; -top: 4px; -right: 5px; +top: 12px; } .graph-toolbar { @@ -232,4 +230,12 @@ g.type-TK>rect { text-align: left; } } +} + +.lineage-filter-box { +background-color: #e6e6e6; +padding: 4px; +border-radius: 5px; +width: 100%; +box-shadow: 1px 3px 3px 2px #bfbfbf; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/atlas/blob/66bf4164/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html -- diff --git a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html index 096fb5b..cde8fed 100644 --- a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html +++ b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html @@ -16,16 +16,27 @@ --> + + +Load Process: +Show + + + + +Hide + + + + + + - + Lineage Impact - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/atlas/blob/66bf4164/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 0d95f0c..5385bc4 100644 --- a/dashboardv2/public/js/views/graph/LineageLayoutView.js +++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js @@ -42,12 +42,14 @@ define(['require', /** ui selector cache */ ui: { -graph: ".graph" +graph: ".graph", +checkHideProcess: "[data-id='checkHideProcess']" }, /** ui events hash */ events: function() { var events = {}; +events["click " + this.ui.checkHideProcess] = 'onCheckHideProcess'; return events; }, @@ -56,7 +58,7 @@ define(['require', * @constructs */ initialize: function(options) { -_.extend(this, _.pick(options, 'guid', 'entityDefCollection', 'actionCallBack', 'fetchCollection')); +_.extend(this, _.pick(options, 'processCheck', 'guid', 'entityDefCollection', 'actionCallBack', 'fetchCollection')); this.collection = new VLineageList(); this.lineageData = null; this.typeMap = {}; @@ -64,16 +66,9 @@ define(['require', this.asyncFetchCounter = 0; this.edgeCall; }, -onRender: function() { -var that = this; -this.$('.fontLoader').show(); -this.fetchGraphData(); -if (platform.name === "IE") { -this.$('svg').css('opacity', '0'); -} -if (this.layoutRendered) { -this.layoutRendered(); -} + +initializeGraph: function()
atlas git commit: ATLAS-2917: Filter added for Lineage to hide Process entity. [Forced Update!]
Repository: atlas Updated Branches: refs/heads/master c2a2ec426 -> 9e9f024b4 (forced update) ATLAS-2917: Filter added for Lineage to hide Process entity. Signed-off-by: Sarath Subramanian Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/9e9f024b Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/9e9f024b Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/9e9f024b Branch: refs/heads/master Commit: 9e9f024b4cda210d407bbde43071546d31ca969b Parents: 82e0403 Author: kevalbhatt Authored: Sun Oct 14 12:00:58 2018 -0700 Committer: Sarath Subramanian Committed: Sun Oct 14 12:07:23 2018 -0700 -- dashboardv2/public/css/scss/graph.scss | 14 ++- .../templates/graph/LineageLayoutView_tmpl.html | 21 +++- .../public/js/views/graph/LineageLayoutView.js | 108 +++ 3 files changed, 115 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/9e9f024b/dashboardv2/public/css/scss/graph.scss -- diff --git a/dashboardv2/public/css/scss/graph.scss b/dashboardv2/public/css/scss/graph.scss index 5784095..3fce69d 100644 --- a/dashboardv2/public/css/scss/graph.scss +++ b/dashboardv2/public/css/scss/graph.scss @@ -152,11 +152,9 @@ g.type-TK>rect { fill: $color_bright_turquoise_approx; } -.zoomButtonGroup { -background-color: $white; +.hideProcessContainer { position: absolute; -top: 4px; -right: 5px; +top: 12px; } .graph-toolbar { @@ -232,4 +230,12 @@ g.type-TK>rect { text-align: left; } } +} + +.lineage-filter-box { +background-color: #e6e6e6; +padding: 4px; +border-radius: 5px; +width: 100%; +box-shadow: 1px 3px 3px 2px #bfbfbf; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/atlas/blob/9e9f024b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html -- diff --git a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html index 096fb5b..cde8fed 100644 --- a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html +++ b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html @@ -16,16 +16,27 @@ --> + + +Load Process: +Show + + + + +Hide + + + + + + - + Lineage Impact - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/atlas/blob/9e9f024b/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 0d95f0c..5385bc4 100644 --- a/dashboardv2/public/js/views/graph/LineageLayoutView.js +++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js @@ -42,12 +42,14 @@ define(['require', /** ui selector cache */ ui: { -graph: ".graph" +graph: ".graph", +checkHideProcess: "[data-id='checkHideProcess']" }, /** ui events hash */ events: function() { var events = {}; +events["click " + this.ui.checkHideProcess] = 'onCheckHideProcess'; return events; }, @@ -56,7 +58,7 @@ define(['require', * @constructs */ initialize: function(options) { -_.extend(this, _.pick(options, 'guid', 'entityDefCollection', 'actionCallBack', 'fetchCollection')); +_.extend(this, _.pick(options, 'processCheck', 'guid', 'entityDefCollection', 'actionCallBack', 'fetchCollection')); this.collection = new VLineageList(); this.lineageData = null; this.typeMap = {}; @@ -64,16 +66,9 @@ define(['require', this.asyncFetchCounter = 0; this.edgeCall; }, -onRender: function() { -var that = this; -this.$('.fontLoader').show(); -this.fetchGraphData(); -if (platform.name === "IE") { -this.$('svg').css('opacity', '0'); -} -if (this.layoutRendered) { -this.layoutRendered(); -} + +initializeGraph: function() { +this.g = {}; this.g = new