Repository: incubator-atlas Updated Branches: refs/heads/master af63bb887 -> 454feb47a
ATLAS-733 UI: undefined XHR request is made for every entity GET page request. (kevalbhatt18 via yhemanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/454feb47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/454feb47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/454feb47 Branch: refs/heads/master Commit: 454feb47a1de4da727ab963a8a927996bdcf4965 Parents: af63bb8 Author: Hemanth Yamijala <[email protected]> Authored: Fri May 13 11:42:41 2016 +0530 Committer: Hemanth Yamijala <[email protected]> Committed: Fri May 13 11:42:41 2016 +0530 ---------------------------------------------------------------------- .../views/entity/EntityDetailTableLayoutView.js | 39 ++++++++++++++++---- release-log.txt | 1 + 2 files changed, 33 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/454feb47/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js index 609840e..80cd0ef 100644 --- a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js +++ b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js @@ -65,26 +65,51 @@ define(['require', if (_.isArray(keyValue)) { var subLink = ""; for (var i = 0; i < keyValue.length; i++) { - var inputOutputField = keyValue[i]; + var inputOutputField = keyValue[i], + id = undefined; if (_.isObject(inputOutputField.id)) { id = inputOutputField.id.id; } else { id = inputOutputField.id; } - that.fetchInputOutputValue(id); - //var coma = (i = 0) ? ('') : (','); - subLink += '<div data-id="' + id + '"></div>'; + if (id) { + that.fetchInputOutputValue(id); + subLink += '<div data-id="' + id + '"></div>'; + } else { + subLink += '<div></div>'; + } } table += '<tr><td>' + key + '</td><td>' + subLink + '</td></tr>'; } else if (_.isObject(keyValue)) { - var id = ""; + var id = undefined; if (_.isObject(keyValue.id)) { id = keyValue.id.id; } else { id = keyValue.id; } - that.fetchInputOutputValue(id); - table += '<tr><td>' + key + '</td><td><div data-id="' + id + '"></div></td></tr>'; + if (id) { + that.fetchInputOutputValue(id); + table += '<tr><td>' + key + '</td><td><div data-id="' + id + '"></div></td></tr>'; + } else { + var stringArr = []; + _.each(keyValue, function(val, key) { + var value = ""; + if (_.isObject(val)) { + value = JSON.stringify(val); + } else { + value = val; + } + var attrName = "<span>" + key + " : " + value + "</span>"; + stringArr.push(attrName); + }); + var jointValues = stringArr.join(", "); + if (jointValues.length) { + table += '<tr><td>' + key + '</td><td><div>' + jointValues + '</div></td></tr>'; + } else { + table += '<tr><td>' + key + '</td><td></td></tr>'; + } + } + } else { if (key == "createTime" || key == "lastAccessTime" || key == "retention") { table += '<tr><td>' + key + '</td><td>' + new Date(valueObject[key]) + '</td></tr>'; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/454feb47/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index a067fe9..baa4c67 100644 --- a/release-log.txt +++ b/release-log.txt @@ -20,6 +20,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-733 UI: "undefined" XHR request is made for every entity GET page request. (kevalbhatt18 via yhemanth) ATLAS-663,ATLAS-673 Install Setup: SOLR (tbeerbower via sumasai) ATLAS-629 Kafka messages in ATLAS_HOOK might be lost in HA mode at the instant of failover. (yhemanth) ATLAS-758 hdfs location of hive table is pointing to old location even after rename ( sumasai )
