[atlas] 02/02: ATLAS-3103 UI : Render schema table from relationshipattributes node in the entity API

[kbhatt]

This is an automated email from the ASF dual-hosted git repository.

kbhatt pushed a commit to branch branch-1.0
in repository https://gitbox.apache.org/repos/asf/atlas.git

commit 3fb19af8012f6591f888ea500bf620f3494d663f
Author: gutkaBinit <binitgu...@gmail.com>
AuthorDate: Thu Mar 28 14:01:51 2019 +0530

    ATLAS-3103 UI : Render schema table from relationshipattributes node in the 
entity API
    
    Signed-off-by: kevalbhatt <kbh...@apache.org>
    (cherry picked from commit 4551dcd7af36662c4df8a83af9f599ed1a3a39d4)
---
 dashboardv2/public/js/utils/Utils.js                           |  4 +++-
 .../public/js/views/detail_page/DetailPageLayoutView.js        | 10 +++++++++-
 dashboardv2/public/js/views/search/SearchResultLayoutView.js   |  5 ++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dashboardv2/public/js/utils/Utils.js 
b/dashboardv2/public/js/utils/Utils.js
index 64b7aaf..058bdbf 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -543,7 +543,9 @@ define(['require', 'utils/Globals', 'pnotify', 
'utils/Messages', 'utils/Enums',
         loaderEl.hide ? loaderEl.hide() : null;
         titleBoxEl.fadeIn ? titleBoxEl.fadeIn() : null;
     }
-    Utils.findAndMergeRefEntity = function(attributeObject, referredEntities) {
+    Utils.findAndMergeRefEntity = function(options) {
+        var attributeObject = options.attributeObject,
+            referredEntities = options.referredEntities
         var mergeObject = function(obj) {
             if (obj) {
                 if (obj.attributes) {
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js 
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 15c884b..175c50e 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -131,7 +131,15 @@ define(['require',
                         this.$(".termBox").hide();
                     }
                     // MergerRefEntity.
-                    Utils.findAndMergeRefEntity(collectionJSON.attributes, 
this.entityObject.referredEntities);
+                    Utils.findAndMergeRefEntity({
+                        attributeObject: collectionJSON.attributes,
+                        referredEntities: this.entityObject.referredEntities
+                    });
+
+                    Utils.findAndMergeRefEntity({
+                        attributeObject: collectionJSON.relationshipAttributes,
+                        referredEntities: this.entityObject.referredEntities
+                    });
 
                     if (collectionJSON && collectionJSON.guid) {
                         var tagGuid = collectionJSON.guid;
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js 
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index e38659f..2c7f15e 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -417,7 +417,10 @@ define(['require',
                         }
                         if (isPostMethod) {
                             that.searchCollection.referredEntities = 
dataOrCollection.referredEntities;
-                            
Utils.findAndMergeRefEntity(dataOrCollection.entities, 
dataOrCollection.referredEntities);
+                            Utils.findAndMergeRefEntity({
+                                attributeObject: dataOrCollection.entities,
+                                referredEntities: 
dataOrCollection.referredEntities
+                            });
                             
that.searchCollection.reset(dataOrCollection.entities, { silent: true });
                         }