ATLAS-1141 UI-Issue - Tag with spaces, when searched, then it is wrongly set in search textbox. (Kalyanikashikar via kevalbhatt)
(cherry picked from commit 0023236fbaee47e6c80852943d253b3ff641f823) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/b52ad646 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/b52ad646 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/b52ad646 Branch: refs/heads/0.7-incubating Commit: b52ad6460a19af33c2a84e7ffa216a30b47a104d Parents: 56d92cb Author: Keval Bhatt <[email protected]> Authored: Wed Aug 31 13:52:02 2016 +0530 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Dec 22 15:24:29 2016 -0800 ---------------------------------------------------------------------- .../business_catalog/BusinessCatalogDetailLayoutView.js | 3 ++- .../public/js/views/business_catalog/TreeLayoutView.js | 11 ++++++----- dashboardv2/public/js/views/tag/TagLayoutView.js | 9 +++++---- release-log.txt | 1 + 4 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b52ad646/dashboardv2/public/js/views/business_catalog/BusinessCatalogDetailLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/business_catalog/BusinessCatalogDetailLayoutView.js b/dashboardv2/public/js/views/business_catalog/BusinessCatalogDetailLayoutView.js index d592d1e..0518578 100644 --- a/dashboardv2/public/js/views/business_catalog/BusinessCatalogDetailLayoutView.js +++ b/dashboardv2/public/js/views/business_catalog/BusinessCatalogDetailLayoutView.js @@ -109,7 +109,8 @@ define(['require', this.ui.description.hide(); } if (createdDate) { - this.ui.createDate.html('<strong> Date Created: </strong> ' + new Date(createdDate)); + var splitDate = createdDate.split(":"); + this.ui.createDate.html('<strong> Date Created: </strong> ' + splitDate[0] + " " + splitDate[1] + ":" + splitDate[2] + ":" + splitDate[3] + " (GMT)"); } }, this); }, http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b52ad646/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js b/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js index be47725..9c7816a 100644 --- a/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js +++ b/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js @@ -317,7 +317,7 @@ define(['require', var str = '<option></option>'; this.termCollection.fullCollection.comparator = function(model) { return model.get('name'); - } + }; this.termCollection.fullCollection.sort().each(function(model) { str += '<option>' + model.get('name') + '</option>'; }); @@ -344,7 +344,7 @@ define(['require', }); }, selectFirstElement: function() { - var dataURL = this.$('.taxonomyTree').find('li[data-id="Parent"]').find("a").data('href') + var dataURL = this.$('.taxonomyTree').find('li[data-id="Parent"]').find("a").data('href'); if (dataURL) { this.url = dataURL; if (this.viewBased) { @@ -386,10 +386,11 @@ define(['require', } var name = Utils.checkTagOrTerm(model.get('name'), true); if (name.name) { + // data-name="<space>'<tagName>'" Space is required for DSL search Input if (that.viewBased) { - parentLi = '<div class="tools"><i class="fa fa-refresh fa-spin-custom taxanomyloader"></i><i class="fa fa-ellipsis-h termPopover"></i></div><i class="fa fa-angle-right toggleArrow" data-id="expandArrow" data-href="' + hrefUrl + '"></i><a href="javascript:void(0)" data-href="' + hrefUrl + '" data-name="`' + model.get('name') + '`">' + name.name + '</a>'; + parentLi = '<div class="tools"><i class="fa fa-refresh fa-spin-custom taxanomyloader"></i><i class="fa fa-ellipsis-h termPopover"></i></div><i class="fa fa-angle-right toggleArrow" data-id="expandArrow" data-href="' + hrefUrl + '"></i><a href="javascript:void(0)" data-href="' + hrefUrl + '" data-name=" `' + model.get('name') + '`">' + name.name + '</a>'; } else { - parentLi = '<div class="tools"><i class="fa fa-refresh fa-spin-custom taxanomyloader"></i></div><i class="fa fa-angle-right toggleArrow" data-id="expandArrow" data-href="' + hrefUrl + '"></i><a href="javascript:void(0)" data-href="' + hrefUrl + '" data-name="`' + model.get('name') + '`">' + name.name + '</a>'; + parentLi = '<div class="tools"><i class="fa fa-refresh fa-spin-custom taxanomyloader"></i></div><i class="fa fa-angle-right toggleArrow" data-id="expandArrow" data-href="' + hrefUrl + '"></i><a href="javascript:void(0)" data-href="' + hrefUrl + '" data-name=" `' + model.get('name') + '`">' + name.name + '</a>'; } } }); @@ -405,7 +406,7 @@ define(['require', function createTerm() { that.childCollection.fullCollection.comparator = function(model) { return model.get('name').toLowerCase(); - } + }; that.childCollection.fullCollection.sort().each(function(model, key) { var name = Utils.checkTagOrTerm(model.get('name'), true); var hrefUrl = "/api" + model.get('href').split("/api")[1]; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b52ad646/dashboardv2/public/js/views/tag/TagLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js b/dashboardv2/public/js/views/tag/TagLayoutView.js index b1cb6cc..b22c0ec 100644 --- a/dashboardv2/public/js/views/tag/TagLayoutView.js +++ b/dashboardv2/public/js/views/tag/TagLayoutView.js @@ -154,16 +154,17 @@ define(['require', str = ''; that.tagCollection.fullCollection.comparator = function(model) { return model.get('tags').toLowerCase(); - } + }; that.tagCollection.fullCollection.sort().each(function(model) { if (searchString) { if (model.get('tags').search(new RegExp(searchString, "i")) != -1) { - str += '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + model.get('tags') + '" data-name="`' + model.get('tags') + '`" >' + model.get('tags') + '</a></li>'; + // data-name="<space>'<tagName>'" Space is required for DSL search Input + str += '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + model.get('tags') + '" data-name=" `' + model.get('tags') + '`" >' + model.get('tags') + '</a></li>'; } else { return; } } else { - str += '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + model.get('tags') + '" data-name="`' + model.get('tags') + '`">' + model.get('tags') + '</a></li>'; + str += '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + model.get('tags') + '" data-name=" `' + model.get('tags') + '`">' + model.get('tags') + '</a></li>'; } }); this.ui.tagsParent.empty().html(str); @@ -205,7 +206,7 @@ define(['require', placeholder: "Search Tags", allowClear: true }); - }) + }); modal.on('ok', function() { that.onCreateButton(view); }); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b52ad646/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index e7521ed..0f046b6 100644 --- a/release-log.txt +++ b/release-log.txt @@ -31,6 +31,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-1141 UI-Issue - Tag with spaces, when searched, then it is wrongly set in search textbox. (Kalyanikashikar via kevalbhatt) ATLAS-1129 Remove notification failed logs on retry and add sleep between retries (svimal2106 via sumasai) ATLAS-1126 Fix NPE in getSchema calls (sumasai) ATLAS-1125 Enable compression on hbase audit table (shwethags via sumasai)
