This is an automated email from the ASF dual-hosted git repository.
pinal pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 4643e4ddf6b00d071b319df7ef097cd5be392f15
Author: prasad pawar <prasad.pa...@freestoneinfotech.com>
AuthorDate: Sat Apr 10 10:03:04 2021 +0530
ATLAS-4244: UI Lineage without displayText key, fixed
Signed-off-by: Pinal <pinal-shah>
---
.../public/js/external_lib/atlas-lineage/dist/index.js | 2 +-
dashboardv2/public/js/views/graph/LineageLayoutView.js | 12 ++++++------
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js | 8 ++++----
.../public/js/external_lib/atlas-lineage/dist/index.js | 2 +-
dashboardv3/public/js/views/graph/LineageLayoutView.js | 12 ++++++------
dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js | 8 ++++----
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js
b/dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js
index 0b896fb..1ff2128 100644
--- a/dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js
+++ b/dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof
module?module.exports=e(require("platform"),require("dagreD3")):"function"==typeof
define&&define.amd?define(["platform","dagreD3"],e):"object"==typeof
exports?exports.LineageHelper=e(require("platform"),require("dagreD3")):t.LineageHelper=e(t.platform,t.dagreD3)}(window,(function(t,e){return
function(t){var e={};function n(r){if(e[r])return e[r].exports;var
i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i. [...]
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"object"==typeof
module?module.exports=e(require("platform"),require("dagreD3")):"function"==typeof
define&&define.amd?define(["platform","dagreD3"],e):"object"==typeof
exports?exports.LineageHelper=e(require("platform"),require("dagreD3")):t.LineageHelper=e(t.platform,t.dagreD3)}(window,(function(t,e){return
function(t){var e={};function n(r){if(e[r])return e[r].exports;var
i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i. [...]
\ No newline at end of file
diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js
b/dashboardv2/public/js/views/graph/LineageLayoutView.js
index d933241..bf80509 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -235,7 +235,7 @@ define(['require',
},
onClickLabelFullName: function() {
this.labelFullText = !this.labelFullText;
- this.LineageHelperRef.displayFullName({ bLabelFullText :
this.labelFullText });
+ this.LineageHelperRef.displayFullName({ bLabelFullText:
this.labelFullText });
},
fetchGraphData: function(options) {
var that = this,
@@ -416,7 +416,7 @@ define(['require',
var data = {};
_.each(config, function(valKey, key) {
var val = initialData[key];
- if (_.isUndefined(val) && initialData.attributes[key]) {
+ if (_.isUndefined(val) && initialData.attributes &&
initialData.attributes[key]) {
val = initialData.attributes[key];
}
if (val) {
@@ -430,16 +430,16 @@ define(['require',
"sortBy": false
}));
},
- calculateLineageDetailPanelHeight: function(){
+ calculateLineageDetailPanelHeight: function() {
var $parentContainer = $('#tab-lineage .resizeGraph'),
$panel = $parentContainer.find('.fix-box');
var $parentHeight = $parentContainer.find('.fix-box,
tbody').removeAttr('style').height() - 48, // 48px is the Panels top from the
parent container
$tBody = $panel.find('tbody'),
- panelHeight = $tBody.height() + 100;
- if($parentHeight < panelHeight){
+ panelHeight = $tBody.height() + 100;
+ if ($parentHeight < panelHeight) {
panelHeight = $parentHeight;
}
- $panel.css('height', panelHeight + 'px');
+ $panel.css('height', panelHeight + 'px');
$tBody.css('height', '100%');
}
});
diff --git a/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
b/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
index 04a941b..c780deb 100644
--- a/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
@@ -222,10 +222,10 @@ define(['require',
sortable: false,
formatter: _.extend({},
Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
- var values = model.get('attributes');
- var data =
that.classificationDefCollection.fullCollection.findWhere({ 'name':
model.get('typeName') });
- var attributeDefs =
Utils.getNestedSuperTypeObj({ data: data.toJSON(), collection:
that.classificationDefCollection, attrMerge: true });
- var tagValue = 'NA',
+ var values = model.get('attributes'),
+ data =
that.classificationDefCollection.fullCollection.findWhere({ 'name':
model.get('typeName') }),
+ attributeDefs = data ?
Utils.getNestedSuperTypeObj({ data: data.toJSON(), collection:
that.classificationDefCollection, attrMerge: true }) : null,
+ tagValue = 'NA',
dataType;
if (!_.isEmpty(attributeDefs)) {
var stringValue = "";
diff --git a/dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js
b/dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js
index d90d022..1ff2128 100644
--- a/dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js
+++ b/dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js
@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof
module?module.exports=e(require("platform"),require("dagreD3")):"function"==typeof
define&&define.amd?define(["platform","dagreD3"],e):"object"==typeof
exports?exports.LineageHelper=e(require("platform"),require("dagreD3")):t.LineageHelper=e(t.platform,t.dagreD3)}(window,(function(t,e){return
function(t){var e={};function n(r){if(e[r])return e[r].exports;var
i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i. [...]
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"object"==typeof
module?module.exports=e(require("platform"),require("dagreD3")):"function"==typeof
define&&define.amd?define(["platform","dagreD3"],e):"object"==typeof
exports?exports.LineageHelper=e(require("platform"),require("dagreD3")):t.LineageHelper=e(t.platform,t.dagreD3)}(window,(function(t,e){return
function(t){var e={};function n(r){if(e[r])return e[r].exports;var
i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i. [...]
\ No newline at end of file
diff --git a/dashboardv3/public/js/views/graph/LineageLayoutView.js
b/dashboardv3/public/js/views/graph/LineageLayoutView.js
index d933241..bf80509 100644
--- a/dashboardv3/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv3/public/js/views/graph/LineageLayoutView.js
@@ -235,7 +235,7 @@ define(['require',
},
onClickLabelFullName: function() {
this.labelFullText = !this.labelFullText;
- this.LineageHelperRef.displayFullName({ bLabelFullText :
this.labelFullText });
+ this.LineageHelperRef.displayFullName({ bLabelFullText:
this.labelFullText });
},
fetchGraphData: function(options) {
var that = this,
@@ -416,7 +416,7 @@ define(['require',
var data = {};
_.each(config, function(valKey, key) {
var val = initialData[key];
- if (_.isUndefined(val) && initialData.attributes[key]) {
+ if (_.isUndefined(val) && initialData.attributes &&
initialData.attributes[key]) {
val = initialData.attributes[key];
}
if (val) {
@@ -430,16 +430,16 @@ define(['require',
"sortBy": false
}));
},
- calculateLineageDetailPanelHeight: function(){
+ calculateLineageDetailPanelHeight: function() {
var $parentContainer = $('#tab-lineage .resizeGraph'),
$panel = $parentContainer.find('.fix-box');
var $parentHeight = $parentContainer.find('.fix-box,
tbody').removeAttr('style').height() - 48, // 48px is the Panels top from the
parent container
$tBody = $panel.find('tbody'),
- panelHeight = $tBody.height() + 100;
- if($parentHeight < panelHeight){
+ panelHeight = $tBody.height() + 100;
+ if ($parentHeight < panelHeight) {
panelHeight = $parentHeight;
}
- $panel.css('height', panelHeight + 'px');
+ $panel.css('height', panelHeight + 'px');
$tBody.css('height', '100%');
}
});
diff --git a/dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js
b/dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js
index 7a56206..809c143 100644
--- a/dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js
+++ b/dashboardv3/public/js/views/tag/TagDetailTableLayoutView.js
@@ -222,10 +222,10 @@ define(['require',
sortable: false,
formatter: _.extend({},
Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
- var values = model.get('attributes');
- var data =
that.classificationDefCollection.fullCollection.findWhere({ 'name':
model.get('typeName') });
- var attributeDefs =
Utils.getNestedSuperTypeObj({ data: data.toJSON(), collection:
that.classificationDefCollection, attrMerge: true });
- var tagValue = 'NA',
+ var values = model.get('attributes'),
+ data =
that.classificationDefCollection.fullCollection.findWhere({ 'name':
model.get('typeName') }),
+ attributeDefs = data ?
Utils.getNestedSuperTypeObj({ data: data.toJSON(), collection:
that.classificationDefCollection, attrMerge: true }) : null,
+ tagValue = 'NA',
dataType;
if (!_.isEmpty(attributeDefs)) {
var stringValue = "";
