You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2017/02/22 18:36:03 UTC
[1/3] incubator-atlas git commit: ATLAS-1567: exclude hadoop-common
library in Falcon hook packaging, as it is alreay present in Falcon classpath
Repository: incubator-atlas
Updated Branches:
refs/heads/master dbfca6224 -> 17a9aad06
ATLAS-1567: exclude hadoop-common library in Falcon hook packaging, as it is alreay present in Falcon classpath
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/b7d880dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/b7d880dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/b7d880dd
Branch: refs/heads/master
Commit: b7d880ddea3745d97b8173818c012f5ff275f47d
Parents: dbfca62
Author: nixonrodrigues <ni...@freestoneinfotech.com>
Authored: Wed Feb 22 18:38:13 2017 +0530
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Wed Feb 22 09:45:56 2017 -0800
----------------------------------------------------------------------
addons/falcon-bridge/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b7d880dd/addons/falcon-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index eff7e75..6c87c71 100644
--- a/addons/falcon-bridge/pom.xml
+++ b/addons/falcon-bridge/pom.xml
@@ -215,11 +215,6 @@
<version>${kafka.version}</version>
</artifactItem>
<artifactItem>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </artifactItem>
- <artifactItem>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
[3/3] incubator-atlas git commit: ATLAS-1585 : Search result page
should show the entityType for each result
Posted by ma...@apache.org.
ATLAS-1585 : Search result page should show the entityType for each result
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/17a9aad0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/17a9aad0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/17a9aad0
Branch: refs/heads/master
Commit: 17a9aad063c0905f9e15cfa650a92ac26f2c46ba
Parents: c74ba14
Author: kevalbhatt <kb...@apache.org>
Authored: Wed Feb 22 14:41:35 2017 +0530
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Wed Feb 22 10:21:28 2017 -0800
----------------------------------------------------------------------
dashboardv2/public/css/scss/override.scss | 9 ++++--
dashboardv2/public/css/scss/tree.scss | 1 +
dashboardv2/public/js/modules/Modal.js | 5 +---
.../js/views/audit/AuditTableLayoutView.js | 31 +++++++++++---------
.../js/views/search/SearchResultLayoutView.js | 18 ++++++++++++
5 files changed, 43 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/17a9aad0/dashboardv2/public/css/scss/override.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/override.scss b/dashboardv2/public/css/scss/override.scss
index 5c8206d..89c12ca 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -223,9 +223,12 @@
}
.backgrid-paginator ul > .disabled > span,
-.backgrid-paginator ul > .disabled > a,
-.backgrid-paginator ul > .disabled > a:hover {
- cursor: pointer;
+.backgrid-paginator ul > .disabled > a {
+ &:hover {
+ cursor: not-allowed;
+ background-color: #7ed3be !important;
+ }
+
}
.popover {
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/17a9aad0/dashboardv2/public/css/scss/tree.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/tree.scss b/dashboardv2/public/css/scss/tree.scss
index 29210a0..50396ba 100644
--- a/dashboardv2/public/css/scss/tree.scss
+++ b/dashboardv2/public/css/scss/tree.scss
@@ -173,5 +173,6 @@
}
.popoverTerm {
+ text-align: center;
margin-top: 25px !important;
}
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/17a9aad0/dashboardv2/public/js/modules/Modal.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/modules/Modal.js b/dashboardv2/public/js/modules/Modal.js
index 1f64f40..e5c7e6f 100644
--- a/dashboardv2/public/js/modules/Modal.js
+++ b/dashboardv2/public/js/modules/Modal.js
@@ -16,10 +16,7 @@
* limitations under the License.
*/
-define(function(require) {
-
- var Backbone = require('backbone');
- var template = require('hbs!tmpl/common/modal');
+define(['require', 'backbone', 'hbs!tmpl/common/modal'], function(require, Backbone, template) {
var Modal = Backbone.View.extend({
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/17a9aad0/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
index d837cf3..b98e512 100644
--- a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
@@ -92,28 +92,34 @@ define(['require',
getToOffset: function() {
var toOffset = 0;
if (this.entityCollection.models.length < this.count) {
- toOffset = ((this.currPage - 1) * (this.count - 1) + (this.entityCollection.models.length));
+ toOffset = (this.getFromOffset() + (this.entityCollection.models.length));
} else {
- toOffset = ((this.currPage - 1) * (this.count - 1) + (this.entityCollection.models.length - 1));
+ toOffset = (this.getFromOffset() + (this.entityCollection.models.length - 1));
}
return toOffset;
},
+ getFromOffset: function(options) {
+ var count = (this.currPage - 1) * (this.count - 1);
+ if (options && (options.nextClick || options.previousClick || this.entityCollection.models.length)) {
+ return count + 1;
+ } else {
+ return count;
+ }
+ },
renderOffset: function(options) {
- var that = this;
if (options.nextClick) {
options.previous.removeAttr("disabled");
- if (that.entityCollection.length != 0) {
- that.currPage++;
- that.ui.pageRecordText.html("Showing " + ((that.currPage - 1) * (that.count - 1) + 1) + " - " + that.getToOffset());
+ if (this.entityCollection.length != 0) {
+ this.currPage++;
+
}
- }
- if (options.previousClick) {
+ } else if (options.previousClick) {
options.next.removeAttr("disabled");
- if (that.currPage > 1 && that.entityCollection.models.length) {
- that.currPage--;
- that.ui.pageRecordText.html("Showing " + ((that.currPage - 1) * (that.count - 1) + 1) + " - " + that.getToOffset());
+ if (this.currPage > 1 && this.entityCollection.models.length) {
+ this.currPage--;
}
}
+ this.ui.pageRecordText.html("Showing " + this.getFromOffset(options) + " - " + this.getToOffset());
},
fetchCollection: function(options) {
var that = this;
@@ -130,9 +136,6 @@ define(['require',
options.previous.attr('disabled', true);
options.next.attr('disabled', true);
}
- if (!options.nextClick && !options.previousClick) {
- that.ui.pageRecordText.html("Showing " + ((that.currPage - 1) * (that.count - 1) + 1) + " - " + that.getToOffset());
- }
that.$('.fontLoader').hide();
that.$('.auditTable').show();
that.renderOffset(options);
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/17a9aad0/dashboardv2/public/js/views/search/SearchResultLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 71319b9..85d642f 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -398,6 +398,24 @@ define(['require',
}
})
};
+ col['typeName'] = {
+ label: "Type",
+ cell: "Html",
+ editable: false,
+ sortable: false,
+ formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
+ fromRaw: function(rawValue, model) {
+ if (that.searchCollection.queryType == "DSL") {
+ var obj = model.toJSON();
+ } else {
+ var obj = model.get('entity');
+ }
+ if (obj && obj.typeName) {
+ return '<a title="Search ' + obj.typeName + '" href="#!/search/searchResult?query=' + obj.typeName + ' &searchType=dsl&dslChecked=true">' + obj.typeName + '</a>';
+ }
+ }
+ })
+ };
col['owner'] = {
label: "Owner",
cell: "String",
[2/3] incubator-atlas git commit: ATLAS-1575: fix for UI issue in
create/edit of hive_table entity
Posted by ma...@apache.org.
ATLAS-1575: fix for UI issue in create/edit of hive_table entity
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/c74ba142
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/c74ba142
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/c74ba142
Branch: refs/heads/master
Commit: c74ba142adf99fff7a17026e179b799ec315ff93
Parents: b7d880d
Author: kevalbhatt <kb...@apache.org>
Authored: Wed Feb 22 17:51:23 2017 +0530
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Wed Feb 22 09:49:16 2017 -0800
----------------------------------------------------------------------
.../js/views/entity/CreateEntityLayoutView.js | 27 ++++++++++++++------
1 file changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/c74ba142/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index 44bcf83..c2ca356 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -137,7 +137,9 @@ define(['require',
this.decrementCounter('asyncFetchLOVCounter');
_.each(this.searchCollection.fullCollection.models, function(model) {
var obj = model.toJSON();
- obj['queryText'] = model.collection.queryText;
+ if (that.searchCollection && that.searchCollection.queryText) {
+ obj['queryText'] = that.searchCollection.queryText;
+ }
that.selectStoreCollection.push(obj);
})
this.addJsonSearchData();
@@ -241,6 +243,7 @@ define(['require',
}
});
this.ui.entityList.html(str);
+ this.ui.entityList.select2({});
}
},
capitalize: function(string) {
@@ -488,6 +491,10 @@ define(['require',
var entity = {};
var referredEntities = {};
var extractValue = function(value) {
+ if (!value) {
+ return value;
+ }
+
if (_.isArray(value)) {
if (that.selectStoreCollection.length) {
var parseData = [];
@@ -574,6 +581,8 @@ define(['require',
if (_.isString(value)) {
if (value.length) {
entity[datakeyEntity] = value;
+ } else {
+ entity[datakeyEntity] = null;
}
} else {
entity[datakeyEntity] = value;
@@ -601,8 +610,8 @@ define(['require',
if (that.guid && that.callback) {
that.callback();
} else {
- if (model.createdEntities && _.isArray(model.createdEntities) && model.createdEntities[0] && model.createdEntities[0].guid) {
- that.setUrl('#!/detailPage/' + (model.createdEntities[0].guid), true);
+ if (model.mutatedEntities && model.mutatedEntities.CREATE && _.isArray(model.mutatedEntities.CREATE) && model.mutatedEntities.CREATE[0] && model.mutatedEntities.CREATE[0].guid) {
+ that.setUrl('#!/detailPage/' + (model.mutatedEntities.CREATE[0].guid), true);
}
}
},
@@ -646,11 +655,13 @@ define(['require',
var appendOption = function(optionValue) {
var obj = optionValue.toJSON(),
labelName = (_.escape(obj.displayText) || _.escape(obj.attributes && obj.attributes.name ? obj.attributes.name : null) || obj.guid);
- optionValue.set('labelName', labelName);
- if (labelName) {
- var str = '<option>' + _.escape(labelName) + '</option>';
+ if (obj && obj.queryText) {
+ optionValue.set('labelName', labelName);
+ if (labelName) {
+ var str = '<option>' + _.escape(labelName) + '</option>';
+ }
+ that.$('select[data-queryData="' + obj.queryText + '"]').append(str);
}
- this.$('select[data-queryData="' + obj.queryText + '"]').append(str);
}
_.each(this.selectStoreCollection.models, function(value) {
var obj = value.toJSON();
@@ -701,7 +712,7 @@ define(['require',
});
// Array of string.
- if (selectedValue.length === 0 && dataValue && dataValue.length) {
+ if (selectedValue.length === 0 && dataValue && dataValue.length && $this.data('querydata') === "string") {
var str = "";
_.each(dataValue, function(obj) {
if (_.isString(obj)) {