You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2019/01/10 15:13:45 UTC
[1/4] atlas git commit: ATLAS-3027 : UI : Metric modal Improvements
Repository: atlas
Updated Branches:
refs/heads/branch-1.0 6b81507a5 -> 697baf4c0
ATLAS-3027 : UI : Metric modal Improvements
(cherry picked from commit e8b32778cad16a61bcb6341b32fee90301028f71)
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/598184c8
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/598184c8
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/598184c8
Branch: refs/heads/branch-1.0
Commit: 598184c8763c86adc7e75409a9203271f42ce184
Parents: 325f9da
Author: kevalbhatt <kb...@apache.org>
Authored: Thu Jan 10 18:50:03 2019 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Thu Jan 10 20:42:58 2019 +0530
----------------------------------------------------------------------
dashboardv2/public/css/scss/override.scss | 2 +-
dashboardv2/public/css/scss/style.scss | 1 +
dashboardv2/public/css/scss/table.scss | 31 ++++++++++++++++++++
dashboardv2/public/js/router/Router.js | 4 +--
.../js/templates/common/Statistics_tmpl.html | 16 +++++-----
.../public/js/views/common/Statistics.js | 23 +++++++++++----
6 files changed, 61 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/598184c8/dashboardv2/public/css/scss/override.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/override.scss b/dashboardv2/public/css/scss/override.scss
index 2dca3a5..5754aac 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -50,7 +50,7 @@
.modal-body {
position: relative;
padding: 15px;
- max-height: 400px;
+ max-height: 72vh;
min-height: 70px;
overflow: auto;
http://git-wip-us.apache.org/repos/asf/atlas/blob/598184c8/dashboardv2/public/css/scss/style.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/style.scss b/dashboardv2/public/css/scss/style.scss
index cd1781b..904aa4e 100644
--- a/dashboardv2/public/css/scss/style.scss
+++ b/dashboardv2/public/css/scss/style.scss
@@ -19,6 +19,7 @@
@import "__mixin.scss";
@import "__variable.scss";
@import "common.scss";
+@import "table.scss";
@import "tab.scss";
@import "form.scss";
@import "nav.scss";
http://git-wip-us.apache.org/repos/asf/atlas/blob/598184c8/dashboardv2/public/css/scss/table.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/table.scss b/dashboardv2/public/css/scss/table.scss
new file mode 100644
index 0000000..7aa4774
--- /dev/null
+++ b/dashboardv2/public/css/scss/table.scss
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.stat-table {
+
+ tbody,
+ thead {
+ >tr {
+
+ td:nth-child(2),
+ th:nth-child(2) {
+ text-align: right;
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/598184c8/dashboardv2/public/js/router/Router.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/router/Router.js b/dashboardv2/public/js/router/Router.js
index 1bb98a1..9f4536e 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -76,8 +76,8 @@ define([
$('body').on('click', 'a.show-stat', function() {
require([
'views/common/Statistics',
- ], function(AboutAtlas) {
- new AboutAtlas();
+ ], function(Statistics) {
+ new Statistics();
});
});
$('body').on('click', 'li.aboutAtlas', function() {
http://git-wip-us.apache.org/repos/asf/atlas/blob/598184c8/dashboardv2/public/js/templates/common/Statistics_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/common/Statistics_tmpl.html b/dashboardv2/public/js/templates/common/Statistics_tmpl.html
index cecdf20..13e64a7 100644
--- a/dashboardv2/public/js/templates/common/Statistics_tmpl.html
+++ b/dashboardv2/public/js/templates/common/Statistics_tmpl.html
@@ -15,10 +15,10 @@
* limitations under the License.
-->
<div class="panel-group" id="accordion">
- <div class="panel panel-default expand_collapse_panel-icon">
+ <div class="panel panel-default expand_collapse_panel-icon" data-id="entityActive">
<div class="panel-heading" data-toggle="collapse" href="#collapse1" aria-expanded="true">
<h4 class="panel-title">
- <a>Active Entities</a>
+ <a>Active Entities <span class="count">(0)</span></a>
</h4>
<div class="btn-group pull-right">
<button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
@@ -26,23 +26,23 @@
</div>
<div id="collapse1" class="panel-collapse collapse in">
<div class="panel-body">
- <table class="table table-quickMenu">
+ <table class="table stat-table">
<thead>
<tr>
<th>Entity</th>
<th>Count</th>
</tr>
</thead>
- <tbody data-id="entityActive">
+ <tbody >
</tbody>
</table>
</div>
</div>
</div>
- <div class="panel panel-default expand_collapse_panel-icon">
+ <div class="panel panel-default expand_collapse_panel-icon" data-id="entityDelete">
<div class="panel-heading" data-toggle="collapse" href="#collapse2">
<h4 class="panel-title">
- <a>Deleted Entities</a>
+ <a>Deleted Entities <span class="count">(0)</span></a>
</h4>
<div class="btn-group pull-right">
<button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
@@ -50,14 +50,14 @@
</div>
<div id="collapse2" class="panel-collapse collapse">
<div class="panel-body">
- <table class="table table-quickMenu">
+ <table class="table stat-table">
<thead>
<tr>
<th>Entity</th>
<th>Count</th>
</tr>
</thead>
- <tbody data-id="entityDelete">
+ <tbody >
</tbody>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/598184c8/dashboardv2/public/js/views/common/Statistics.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/common/Statistics.js b/dashboardv2/public/js/views/common/Statistics.js
index 0f567e2..11c5463 100644
--- a/dashboardv2/public/js/views/common/Statistics.js
+++ b/dashboardv2/public/js/views/common/Statistics.js
@@ -35,8 +35,10 @@ define(['require',
regions: {},
/** ui selector cache */
ui: {
- entityActive: "[data-id='entityActive']",
- entityDelete: "[data-id='entityDelete']"
+ entityActive: "[data-id='entityActive'] tbody",
+ entityDelete: "[data-id='entityDelete'] tbody",
+ entityActiveHeader: "[data-id='entityActive'] .count",
+ entityDeletedHeader: "[data-id='entityDelete'] .count"
},
/** ui events hash */
events: function() {},
@@ -51,7 +53,7 @@ define(['require',
content: this,
okCloses: true,
showFooter: true,
- allowCancel: false,
+ allowCancel: false
}).open();
modal.on('closeModal', function() {
@@ -70,12 +72,23 @@ define(['require',
no_records = '<tr class="empty text-center"><td colspan="2"><span>No records found!</span></td></tr>',
activeEntityTable = _.isEmpty(data.entity.entityActive) ? no_records : CommonViewFunction.propertyTable({ scope: that, valueObject: data.entity.entityActive }),
deleteEntityTable = _.isEmpty(data.entity.entityDeleted) ? no_records : CommonViewFunction.propertyTable({ scope: that, valueObject: data.entity.entityDeleted });
+ var totalActive = 0,
+ totalDeleted = 0;
+ if (data.entity && data.general.entityCount) {
+ totalActive = data.general.entityCount;
+ }
+ if (data.entity && data.entity.entityDeleted) {
+ _.each(data.entity.entityDeleted, function(val) {
+ totalDeleted += val;
+ });
+ }
that.ui.entityActive.html(activeEntityTable);
that.ui.entityDelete.html(deleteEntityTable);
+ that.ui.entityActiveHeader.html(" (" + (totalActive - totalDeleted) + ")");
+ that.ui.entityDeletedHeader.html(" (" + totalDeleted + ")");
}
});
- },
-
+ }
});
return StatisticsView;
});
\ No newline at end of file
[2/4] atlas git commit: ATLAS-3025 : UI - If go to page is more/less
then the available page limit then an error appears in the console
Posted by kb...@apache.org.
ATLAS-3025 : UI - If go to page is more/less then the available page limit then an error appears in the console
(cherry picked from commit b455040d06be2c6330dfb0b11e34c6ea480a0b7c)
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/325f9da9
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/325f9da9
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/325f9da9
Branch: refs/heads/branch-1.0
Commit: 325f9da92fe21dbace562f15e79702e3e97b66b8
Parents: 6b81507
Author: kevalbhatt <kb...@apache.org>
Authored: Thu Jan 10 18:11:11 2019 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Thu Jan 10 20:42:58 2019 +0530
----------------------------------------------------------------------
dashboardv2/public/js/utils/TableLayout.js | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/325f9da9/dashboardv2/public/js/utils/TableLayout.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/TableLayout.js b/dashboardv2/public/js/utils/TableLayout.js
index 9f5db6f..150d690 100644
--- a/dashboardv2/public/js/utils/TableLayout.js
+++ b/dashboardv2/public/js/utils/TableLayout.js
@@ -626,6 +626,14 @@ define(['require',
gotoPagebtn: function(e) {
var that = this;
var goToPage = parseInt(this.ui.gotoPage.val());
+ if (!_.isNaN(goToPage) && ((goToPage == 0) || (this.collection.state.totalPages < goToPage))) {
+ Utils.notifyInfo({
+ content: Messages.search.noRecordForPage + "page " + goToPage
+ });
+ this.ui.gotoPage.val('')
+ that.ui.gotoPagebtn.attr('disabled', true);
+ return;
+ }
if (!(_.isNaN(goToPage) || goToPage <= -1)) {
if (this.collection.mode == "client") {
return this.collection.getPage((goToPage - 1), {
[4/4] atlas git commit: ATLAS-3010: UI - Lineage hide process filter
is not working
Posted by kb...@apache.org.
ATLAS-3010: UI - Lineage hide process filter is not working
Signed-off-by: kevalbhatt <kb...@apache.org>
(cherry picked from commit 3871be8b1e5496214b6d6adf1ee4c334d54f54b6)
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/697baf4c
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/697baf4c
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/697baf4c
Branch: refs/heads/branch-1.0
Commit: 697baf4c079f70f4839f1b84731e2280e84c6265
Parents: c2141f5
Author: Abhishek Kadam <ab...@gmail.com>
Authored: Thu Jan 10 12:49:28 2019 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Thu Jan 10 20:43:23 2019 +0530
----------------------------------------------------------------------
dashboardv2/public/js/views/graph/LineageLayoutView.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/697baf4c/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 2f64f1e..804dbe7 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -204,6 +204,9 @@ define(['require',
var that = this;
function isProcess(typeName) {
+ if (typeName == "Process") {
+ return true;
+ }
var entityDef = that.entityDefCollection.fullCollection.find({ name: typeName });
return _.contains(Utils.getNestedSuperTypes({ data: entityDef.toJSON(), collection: that.entityDefCollection }), "Process")
}
[3/4] atlas git commit: ATLAS-3026 : Column level lineage show the
invalid icon for the process
Posted by kb...@apache.org.
ATLAS-3026 : Column level lineage show the invalid icon for the process
(cherry picked from commit 665f8311e45477ffdf951b7f9d9eb304badfaab8)
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/c2141f59
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/c2141f59
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/c2141f59
Branch: refs/heads/branch-1.0
Commit: c2141f593bc2584b1ce54433e93dd8cf2133dd37
Parents: 598184c
Author: kevalbhatt <kb...@apache.org>
Authored: Thu Jan 10 18:51:21 2019 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Thu Jan 10 20:43:23 2019 +0530
----------------------------------------------------------------------
.../entity-icon/hive/hive_column_lineage.png | Bin 12483 -> 15471 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/c2141f59/dashboardv2/public/img/entity-icon/hive/hive_column_lineage.png
----------------------------------------------------------------------
diff --git a/dashboardv2/public/img/entity-icon/hive/hive_column_lineage.png b/dashboardv2/public/img/entity-icon/hive/hive_column_lineage.png
index 1dec4f6..23d6064 100644
Binary files a/dashboardv2/public/img/entity-icon/hive/hive_column_lineage.png and b/dashboardv2/public/img/entity-icon/hive/hive_column_lineage.png differ