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 2017/09/26 12:55:45 UTC
[1/3] atlas git commit: ATLAS-2168 : When a second search is fired in
between the pages of the first search results , offset is not reset to 0
Repository: atlas
Updated Branches:
refs/heads/branch-0.8 82dbf3adc -> 36c2e3c09
ATLAS-2168 : When a second search is fired in between the pages of the first search results , offset is not reset to 0
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/a918714b
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/a918714b
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/a918714b
Branch: refs/heads/branch-0.8
Commit: a918714bb635f749cb2d1e696762e17e2e27f7cb
Parents: 82dbf3a
Author: kevalbhatt <kb...@apache.org>
Authored: Tue Sep 26 12:36:21 2017 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Tue Sep 26 18:22:41 2017 +0530
----------------------------------------------------------------------
.../public/js/views/search/SearchLayoutView.js | 21 ++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/a918714b/dashboardv2/public/js/views/search/SearchLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js b/dashboardv2/public/js/views/search/SearchLayoutView.js
index b032ea9..df50800 100644
--- a/dashboardv2/public/js/views/search/SearchLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchLayoutView.js
@@ -61,7 +61,6 @@ define(['require',
events["keyup " + this.ui.searchInput] = function(e) {
var code = e.which;
this.value.query = e.currentTarget.value;
- this.query[this.type].query = this.value.query;
if (code == 13) {
that.findSearchResult();
}
@@ -244,7 +243,7 @@ define(['require',
}
});
},
- checkForButtonVisiblity: function(e) {
+ checkForButtonVisiblity: function(e, options) {
if (this.type == "basic" && e && e.currentTarget) {
var $el = $(e.currentTarget),
isTagEl = $el.data('id') == "tagLOV" ? true : false;
@@ -260,7 +259,9 @@ define(['require',
temp[key] = value;
_.extend(this.value, temp);
// on change of type/tag change the offset.
- this.query[this.type].pageOffset = 0;
+ if (_.isUndefined(options)) {
+ this.value.pageOffset = 0;
+ }
_.extend(this.query[this.type], temp);
} else {
// Initial loading handle.
@@ -458,9 +459,9 @@ define(['require',
if (this.ui.typeLov.data('select2')) {
if (this.ui.typeLov.val() !== this.value.type) {
this.value.type = null;
- this.ui.typeLov.val("").trigger("change");
+ this.ui.typeLov.val("").trigger("change", { 'manual': true });
} else {
- this.ui.typeLov.trigger("change");
+ this.ui.typeLov.trigger("change", { 'manual': true });
}
}
@@ -470,9 +471,9 @@ define(['require',
// To handle delete scenario.
if (this.ui.tagLov.val() !== this.value.tag) {
this.value.tag = null;
- this.ui.tagLov.val("").trigger("change");
+ this.ui.tagLov.val("").trigger("change", { 'manual': true });
} else {
- this.ui.tagLov.trigger("change");
+ this.ui.tagLov.trigger("change", { 'manual': true });
}
}
}
@@ -510,11 +511,11 @@ define(['require',
params['includeDE'] = this.value.includeDE;
}
}
- if (this.value.pageLimit) {
+ if (!_.isUndefinedNull(this.value.pageLimit)) {
params['pageLimit'] = this.value.pageLimit;
}
- if (this.value.pageOffset) {
- if (this.query[this.type].query && this.query[this.type].query != value) {
+ if (!_.isUndefinedNull(this.value.pageOffset)) {
+ if (!_.isUndefinedNull(this.query[this.type]) && this.query[this.type].query != value) {
params['pageOffset'] = 0;
} else {
params['pageOffset'] = this.value.pageOffset;
[3/3] atlas git commit: ATLAS-2153 : UI : Adding more columns to the
search table masks the Remove tag button
Posted by kb...@apache.org.
ATLAS-2153 : UI : Adding more columns to the search table masks the Remove tag button
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/36c2e3c0
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/36c2e3c0
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/36c2e3c0
Branch: refs/heads/branch-0.8
Commit: 36c2e3c09724e1870ef707e776a048e07df84e8b
Parents: e2fe656
Author: kevalbhatt <kb...@apache.org>
Authored: Mon Sep 25 14:20:43 2017 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Tue Sep 26 18:23:15 2017 +0530
----------------------------------------------------------------------
dashboardv2/public/css/scss/form.scss | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/36c2e3c0/dashboardv2/public/css/scss/form.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/form.scss b/dashboardv2/public/css/scss/form.scss
index b83fb9c..694e885 100644
--- a/dashboardv2/public/css/scss/form.scss
+++ b/dashboardv2/public/css/scss/form.scss
@@ -220,14 +220,18 @@ button:focus {
}
.btn-fixed-width {
- .btn-icon>span {
- @include ellipsis();
- float: left;
- width: 100px;
- padding: 2px 5px !important;
- }
- >i {
- float: right;
+ .btn-icon {
+ min-width: 100px;
+ >span {
+ @include ellipsis();
+ float: left;
+ width: 76px;
+ padding: 2px 5px !important;
+ }
+ >i {
+ float: right;
+ line-height: 15px;
+ }
}
}
[2/3] atlas git commit: ATLAS-2130 : Call made to fetch tables of a
database doesn't have exlcudeDeletedEntities parameter
Posted by kb...@apache.org.
ATLAS-2130 : Call made to fetch tables of a database doesn't have exlcudeDeletedEntities parameter
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/e2fe6563
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/e2fe6563
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/e2fe6563
Branch: refs/heads/branch-0.8
Commit: e2fe6563c1b3d3c07bc2564e7064a602d41901e2
Parents: a918714
Author: kevalbhatt <kb...@apache.org>
Authored: Mon Sep 25 18:01:57 2017 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Tue Sep 26 18:22:57 2017 +0530
----------------------------------------------------------------------
dashboardv2/public/js/router/Router.js | 2 ++
.../public/js/views/detail_page/DetailPageLayoutView.js | 5 +++--
dashboardv2/public/js/views/profile/ProfileLayoutView.js | 7 +++----
dashboardv2/public/js/views/search/SearchResultLayoutView.js | 8 +++++++-
4 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/e2fe6563/dashboardv2/public/js/router/Router.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/router/Router.js b/dashboardv2/public/js/router/Router.js
index 64eb3f3..59d22c9 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -160,6 +160,7 @@ define([
'collection/VEntityList'
], function(Header, DetailPageLayoutView, SideNavLayoutView, VEntityList) {
this.entityCollection = new VEntityList([], {});
+ var paramObj = Utils.getUrlState.getQueryParams();
App.rNHeader.show(new Header());
if (!App.rSideNav.currentView) {
App.rSideNav.show(new SideNavLayoutView(
@@ -171,6 +172,7 @@ define([
App.rNContent.show(new DetailPageLayoutView(_.extend({
'collection': this.entityCollection,
'id': id,
+ 'value': paramObj
}, that.preFetchedCollectionLists, that.sharedObj)));
this.entityCollection.url = UrlLinks.entitiesApiUrl(id);
this.entityCollection.fetch({ reset: true });
http://git-wip-us.apache.org/repos/asf/atlas/blob/e2fe6563/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 480e9e3..4a1c601 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -106,7 +106,7 @@ define(['require',
* @constructs
*/
initialize: function(options) {
- _.extend(this, _.pick(options, 'collection', 'id', 'entityDefCollection', 'typeHeaders', 'enumDefCollection', 'classificationDefCollection'));
+ _.extend(this, _.pick(options, 'value', 'collection', 'id', 'entityDefCollection', 'typeHeaders', 'enumDefCollection', 'classificationDefCollection'));
this.bindEvents();
},
bindEvents: function() {
@@ -200,7 +200,8 @@ define(['require',
this.renderProfileLayoutView(_.extend({}, obj, {
entityDetail: collectionJSON.attributes,
profileData: collectionJSON.attributes.profileData,
- typeName: collectionJSON.typeName
+ typeName: collectionJSON.typeName,
+ value: that.value
}));
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/e2fe6563/dashboardv2/public/js/views/profile/ProfileLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/profile/ProfileLayoutView.js b/dashboardv2/public/js/views/profile/ProfileLayoutView.js
index 6b640d9..79cf3a5 100644
--- a/dashboardv2/public/js/views/profile/ProfileLayoutView.js
+++ b/dashboardv2/public/js/views/profile/ProfileLayoutView.js
@@ -57,7 +57,7 @@ define(['require',
* @constructs
*/
initialize: function(options) {
- _.extend(this, _.pick(options, 'profileData', 'guid', 'typeName', 'entityDetail', 'typeHeaders', 'entityDefCollection', 'enumDefCollection', 'classificationDefCollection'));
+ _.extend(this, _.pick(options, 'profileData', 'guid', 'value', 'typeName', 'entityDetail', 'typeHeaders', 'entityDefCollection', 'enumDefCollection', 'classificationDefCollection'));
if (this.typeName === "hive_db") {
this.profileData = { attributes: true };
}
@@ -73,16 +73,15 @@ define(['require',
this.renderProfileColumnLayoutView();
}
}
-
},
renderSearchResultLayoutView: function() {
var that = this;
require(['views/search/SearchResultLayoutView'], function(SearchResultLayoutView) {
- var value = {
+ var value = _.extend({}, that.value, {
'guid': that.guid,
'searchType': 'relationship',
'profileDBView': true
- };
+ });
that.RProfileTableOrColumnLayoutView.show(new SearchResultLayoutView({
'value': value,
'typeHeaders': that.typeHeaders,
http://git-wip-us.apache.org/repos/asf/atlas/blob/e2fe6563/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 f20dc6e..fbcd352 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -406,7 +406,7 @@ define(['require',
}
if (isPostMethod) {
that.searchCollection.referredEntities = dataOrCollection.rnoRecordFoeferredEntities;
- that.searchCollection.reset(dataOrCollection.entities);
+ that.searchCollection.reset(dataOrCollection.entities, { silent: true });
}
/*Next button check.
@@ -480,6 +480,9 @@ define(['require',
} else {
apiObj.data = null;
this.searchCollection.filterObj = null;
+ if (this.value.profileDBView) {
+ _.extend(this.searchCollection.queryParams, { 'excludeDeletedEntities': (this.value && this.value.includeDE ? false : true) });
+ }
Globals.searchApiCallRef = this.searchCollection.fetch(apiObj);
}
} else {
@@ -490,6 +493,9 @@ define(['require',
Globals.searchApiCallRef = this.searchCollection.getBasicRearchResult(apiObj);
} else {
apiObj.data = null;
+ if (this.value.profileDBView) {
+ _.extend(this.searchCollection.queryParams, { 'excludeDeletedEntities': (this.value && this.value.includeDE ? false : true) });
+ }
Globals.searchApiCallRef = this.searchCollection.fetch(apiObj);
}
}