atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kbh...@apache.org
Subject [3/3] atlas git commit: ATLAS-2130 : Call made to fetch tables of a database doesn't have exlcudeDeletedEntities parameter
Date Tue, 26 Sep 2017 12:57:00 GMT
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/234b3005
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/234b3005
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/234b3005

Branch: refs/heads/master
Commit: 234b3005abc1876e4eb03ff767601f9097d14a22
Parents: 6426e9d
Author: kevalbhatt <kbhatt@apache.org>
Authored: Mon Sep 25 18:01:57 2017 +0530
Committer: kevalbhatt <kbhatt@apache.org>
Committed: Tue Sep 26 18:26:25 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/234b3005/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/234b3005/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/234b3005/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/234b3005/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);
                     }
                 }


Mime
View raw message