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 2019/03/28 12:33:18 UTC
[atlas] branch branch-1.0 updated (6cc4476 -> 3fb19af)
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a change to branch branch-1.0
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from 6cc4476 ATLAS-3092:Atlas Plugin ClassLoader Doesn't Restore Thread ClassLoader
new 5dc6213 ATLAS-3105 : UI : Distorted image is downloaded, for certain conditions
new 3fb19af ATLAS-3103 UI : Render schema table from relationshipattributes node in the entity API
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dashboardv2/public/js/utils/Utils.js | 4 +++-
.../public/js/views/detail_page/DetailPageLayoutView.js | 10 +++++++++-
dashboardv2/public/js/views/graph/LineageLayoutView.js | 6 ++++--
dashboardv2/public/js/views/search/SearchResultLayoutView.js | 5 ++++-
4 files changed, 20 insertions(+), 5 deletions(-)
[atlas] 01/02: ATLAS-3105 : UI : Distorted image is downloaded,
for certain conditions
Posted by kb...@apache.org.
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 5dc6213a177842f4e11d94ce0bb1a76e408aee46
Author: gutkaBinit <bi...@gmail.com>
AuthorDate: Thu Mar 28 15:36:58 2019 +0530
ATLAS-3105 : UI : Distorted image is downloaded, for certain conditions
Signed-off-by: kevalbhatt <kb...@apache.org>
(cherry picked from commit a9fc73a45903aac0e04793a4e9681159ee0a0b03)
---
dashboardv2/public/js/views/graph/LineageLayoutView.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js b/dashboardv2/public/js/views/graph/LineageLayoutView.js
index de510cb..7b9ff58 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -940,8 +940,10 @@ define(['require',
$(svgClone).find('>g').attr("transform", "scale(" + scaleFactor + ")");
var canvasOffset = { x: 150, y: 150 },
setWidth = (svgClone.getBBox().width + (canvasOffset.x)),
- setHeight = (svgClone.getBBox().height + (canvasOffset.y));
- svgClone.attributes.viewBox.value = "-10,-10," + setWidth + "," + setHeight;
+ setHeight = (svgClone.getBBox().height + (canvasOffset.y)),
+ xAxis = svgClone.getBBox().x,
+ yAxis = svgClone.getBBox().y;
+ svgClone.attributes.viewBox.value = xAxis + "," + yAxis + "," + setWidth + "," + setHeight;
var createCanvas = document.createElement('canvas');
createCanvas.id = "canvas";
[atlas] 02/02: ATLAS-3103 UI : Render schema table from
relationshipattributes node in the entity API
Posted by kb...@apache.org.
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 <bi...@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 <kb...@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 });
}