atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shweth...@apache.org
Subject [07/12] incubator-atlas git commit: ATLAS-624 UI: Clicking a tag hyperlink should always result in DSL search. In some cases, results in full-text search. (Kalyanikashikar via yhemanth)
Date Wed, 29 Jun 2016 08:37:53 GMT
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/5fecdc42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/5fecdc42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/5fecdc42

Branch: refs/heads/0.7-incubating
Commit: 5fecdc421fb58732f5d840b4393c5dd26f333696
Parents: 88fb8a1
Author: Shwetha GS <sshivalingamurthy@hortonworks.com>
Authored: Wed Jun 29 12:12:22 2016 +0530
Committer: Shwetha GS <sshivalingamurthy@hortonworks.com>
Committed: Wed Jun 29 12:12:22 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/5fecdc42/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/5fecdc42/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/5fecdc42/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index c011928..ad7cd33 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-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)


Mime
View raw message