Repository: incubator-atlas Updated Branches: refs/heads/master 2692f4768 -> 607e7de26
ATLAS-624 UI: Clicking a tag hyperlink should always result in DSL search. In some cases, results in full-text search. (Kalyanikashikar 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/607e7de2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/607e7de2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/607e7de2 Branch: refs/heads/master Commit: 607e7de266234c19dbb7d86d0210735ed1efce5f Parents: 2692f47 Author: Hemanth Yamijala <[email protected]> Authored: Mon Jun 27 17:09:14 2016 +0530 Committer: Hemanth Yamijala <[email protected]> Committed: Mon Jun 27 17:09:14 2016 +0530 ---------------------------------------------------------------------- dashboardv2/public/js/views/tag/TagDetailLayoutView.js | 4 ++-- dashboardv2/public/js/views/tag/TagLayoutView.js | 11 ++++++----- release-log.txt | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/607e7de2/dashboardv2/public/js/views/tag/TagDetailLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/tag/TagDetailLayoutView.js b/dashboardv2/public/js/views/tag/TagDetailLayoutView.js index 7e0f7ed..bcc9c78 100644 --- a/dashboardv2/public/js/views/tag/TagDetailLayoutView.js +++ b/dashboardv2/public/js/views/tag/TagDetailLayoutView.js @@ -55,8 +55,8 @@ define(['require', var that = this; require(['views/search/SearchResultLayoutView'], function(SearchResultLayoutView) { var value = { - 'query': that.tag, - 'type': 'fulltext' + 'query': "`" + that.tag + "`", + 'type': 'dsl' }; that.RSearchResultLayoutView.show(new SearchResultLayoutView({ value: value, http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/607e7de2/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 42b8078..49811ac 100644 --- a/dashboardv2/public/js/views/tag/TagLayoutView.js +++ b/dashboardv2/public/js/views/tag/TagLayoutView.js @@ -104,6 +104,7 @@ define(['require', fetchCollections: function() { $.extend(this.tagCollection.queryParams, { type: 'TRAIT', }); this.tagCollection.fetch({ reset: true }); + this.ui.offLineSearchTag.val(""); }, manualRender: function(tagName) { this.tag = tagName; @@ -159,13 +160,13 @@ define(['require', if (!tagOrTerm.term) { if (searchString) { if (tagName.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/' + tagName + '">' + tagName + '</a></li>' + str; + str = '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + tagName + '" data-name="`' + tagName + '`" >' + tagName + '</a></li>' + str; } else { return; } } else { //str = '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-trash-o" data-id="deleteTerm"></i></div><a href="#!/tag/tagAttribute/' + tagName + '">' + tagName + '</a></li>' + str; - str = '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + tagName + '">' + tagName + '</a></li>' + str; + str = '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + tagName + '" data-name="`' + tagName + '`">' + tagName + '</a></li>' + str; } } }); @@ -291,9 +292,9 @@ define(['require', Utils.setUrl({ url: '#!/search/searchResult', urlParams: { - query: this.ui.tagsParent.find('li.active').find("a").text(), - searchType: "fulltext", - dslChecked: false + query: this.ui.tagsParent.find('li.active').find("a").data('name'), + searchType: "dsl", + dslChecked: true }, updateTabState: function() { return { searchUrl: this.url, stateChanged: true }; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/607e7de2/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index fd0713e..8ab11ee 100644 --- a/release-log.txt +++ b/release-log.txt @@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES: ALL CHANGES: +ATLAS-624 UI: Clicking a tag hyperlink should always result in DSL search. In some cases, results in full-text search. (Kalyanikashikar via yhemanth) ATLAS-950 Atlas should support Solr that requires Kerberos authentication (madhan.neethiraj via yhemanth) ATLAS-947 Return state information in inputs and outputs lineage API (shwethags) ATLAS-806 Create default taxonomy at server startup (jspeidel via yhemanth)
