Commit 607e7de2 by Hemanth Yamijala

ATLAS-624 UI: Clicking a tag hyperlink should always result in DSL search. In…

ATLAS-624 UI: Clicking a tag hyperlink should always result in DSL search. In some cases, results in full-text search. (Kalyanikashikar via yhemanth)
parent 2692f476
...@@ -55,8 +55,8 @@ define(['require', ...@@ -55,8 +55,8 @@ define(['require',
var that = this; var that = this;
require(['views/search/SearchResultLayoutView'], function(SearchResultLayoutView) { require(['views/search/SearchResultLayoutView'], function(SearchResultLayoutView) {
var value = { var value = {
'query': that.tag, 'query': "`" + that.tag + "`",
'type': 'fulltext' 'type': 'dsl'
}; };
that.RSearchResultLayoutView.show(new SearchResultLayoutView({ that.RSearchResultLayoutView.show(new SearchResultLayoutView({
value: value, value: value,
......
...@@ -104,6 +104,7 @@ define(['require', ...@@ -104,6 +104,7 @@ define(['require',
fetchCollections: function() { fetchCollections: function() {
$.extend(this.tagCollection.queryParams, { type: 'TRAIT', }); $.extend(this.tagCollection.queryParams, { type: 'TRAIT', });
this.tagCollection.fetch({ reset: true }); this.tagCollection.fetch({ reset: true });
this.ui.offLineSearchTag.val("");
}, },
manualRender: function(tagName) { manualRender: function(tagName) {
this.tag = tagName; this.tag = tagName;
...@@ -159,13 +160,13 @@ define(['require', ...@@ -159,13 +160,13 @@ define(['require',
if (!tagOrTerm.term) { if (!tagOrTerm.term) {
if (searchString) { if (searchString) {
if (tagName.search(new RegExp(searchString, "i")) != -1) { 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 { } else {
return; return;
} }
} else { } 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-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', ...@@ -291,9 +292,9 @@ define(['require',
Utils.setUrl({ Utils.setUrl({
url: '#!/search/searchResult', url: '#!/search/searchResult',
urlParams: { urlParams: {
query: this.ui.tagsParent.find('li.active').find("a").text(), query: this.ui.tagsParent.find('li.active').find("a").data('name'),
searchType: "fulltext", searchType: "dsl",
dslChecked: false dslChecked: true
}, },
updateTabState: function() { updateTabState: function() {
return { searchUrl: this.url, stateChanged: true }; return { searchUrl: this.url, stateChanged: true };
......
...@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES: ...@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
ALL 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-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-947 Return state information in inputs and outputs lineage API (shwethags)
ATLAS-806 Create default taxonomy at server startup (jspeidel via yhemanth) ATLAS-806 Create default taxonomy at server startup (jspeidel via yhemanth)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment