Commit 4551dcd7 by gutkaBinit Committed by kevalbhatt

ATLAS-3103 UI : Render schema table from relationshipattributes node in the entity API

Signed-off-by: 's avatarkevalbhatt <kbhatt@apache.org>
parent ba5e6b24
...@@ -550,7 +550,9 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums', ...@@ -550,7 +550,9 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
loaderEl.hide ? loaderEl.hide() : null; loaderEl.hide ? loaderEl.hide() : null;
titleBoxEl.fadeIn ? titleBoxEl.fadeIn() : 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) { var mergeObject = function(obj) {
if (obj) { if (obj) {
if (obj.attributes) { if (obj.attributes) {
......
...@@ -131,7 +131,15 @@ define(['require', ...@@ -131,7 +131,15 @@ define(['require',
this.$(".termBox").hide(); this.$(".termBox").hide();
} }
// MergerRefEntity. // 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
});
// check if entity is process // check if entity is process
var isProcess = false, var isProcess = false,
......
...@@ -417,7 +417,10 @@ define(['require', ...@@ -417,7 +417,10 @@ define(['require',
} }
if (isPostMethod) { if (isPostMethod) {
that.searchCollection.referredEntities = dataOrCollection.referredEntities; 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 }); that.searchCollection.reset(dataOrCollection.entities, { silent: true });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment