From 7017db440689f4580c99105444ecd672fe3b6ec4 Mon Sep 17 00:00:00 2001
From: jbai <jbai@linkedin.com>
Date: Thu, 21 Apr 2016 16:25:08 -0700
Subject: [PATCH] fix the search keyword special characters and comments word
 break issue

---
 web/app/controllers/api/v1/Search.java   | 3 ++-
 web/app/views/index.scala.html           | 2 +-
 web/conf/routes                          | 2 +-
 web/public/javascripts/routers/search.js | 4 ++--
 web/public/javascripts/search.js         | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/app/controllers/api/v1/Search.java b/web/app/controllers/api/v1/Search.java
index 1323646760..af110ebb9e 100644
--- a/web/app/controllers/api/v1/Search.java
+++ b/web/app/controllers/api/v1/Search.java
@@ -38,12 +38,13 @@ public class Search extends Controller
         return ok(result);
     }
 
-    public static Result searchByKeyword(String keyword)
+    public static Result searchByKeyword()
     {
         ObjectNode result = Json.newObject();
 
         int page = 1;
         int size = 10;
+        String keyword = request().getQueryString("keyword");
         String category = request().getQueryString("category");
         String source = request().getQueryString("source");
         String pageStr = request().getQueryString("page");
diff --git a/web/app/views/index.scala.html b/web/app/views/index.scala.html
index 2751f89bac..afdfb05a4a 100644
--- a/web/app/views/index.scala.html
+++ b/web/app/views/index.scala.html
@@ -509,7 +509,7 @@
             </a>
           </div>
         </div>
-        <table class="tree table table-bordered">
+        <table class="tree table table-bordered" style="word-break: break-all;">
           <tbody>
             <tr class="result">
               <td class="span2" style="min-width:200px;">Dashboard Name</td>
diff --git a/web/conf/routes b/web/conf/routes
index dd5e50b10b..4630a49d18 100644
--- a/web/conf/routes
+++ b/web/conf/routes
@@ -101,7 +101,7 @@ POST    /api/v1/datasets/:id/own                    controllers.api.v1.Dataset.o
 
 DELETE  /api/v1/datasets/:id/own                    controllers.api.v1.Dataset.unownDataset(id:Int)
 
-GET     /api/v1/search/:keyword                     controllers.api.v1.Search.searchByKeyword(keyword:String)
+GET     /api/v1/search                              controllers.api.v1.Search.searchByKeyword()
 
 GET     /api/v1/metrics                             controllers.api.v1.Metric.getPagedMetrics()
 
diff --git a/web/public/javascripts/routers/search.js b/web/public/javascripts/routers/search.js
index a1f0ac7e0e..1284947dfd 100644
--- a/web/public/javascripts/routers/search.js
+++ b/web/public/javascripts/routers/search.js
@@ -52,8 +52,8 @@ App.SearchRoute = Ember.Route.extend({
             q = convertQueryStringToObject();
         }
 
-        var keyword = q.keywords;
-        var url = 'api/v1/search/' + keyword + '?page=' + params.page;
+        var keyword = atob(q.keywords);
+        var url = 'api/v1/search' + '?page=' + params.page + "&keyword=" + keyword;
         if(q.category) {
             url += ("&category=" + q.category.toLowerCase());
             currentTab = q.category.toProperCase();
diff --git a/web/public/javascripts/search.js b/web/public/javascripts/search.js
index cdac65ee18..3890730d04 100644
--- a/web/public/javascripts/search.js
+++ b/web/public/javascripts/search.js
@@ -95,7 +95,7 @@
                 if (inputObj) {
                     var keyword = inputObj.val();
                     if (keyword) {
-                        window.location = '/#/search?keywords=' + keyword +
+                        window.location = '/#/search?keywords=' + btoa(keyword) +
                             '&category=Datasets&source=default&page=1';
                     }
                 }
@@ -295,7 +295,7 @@
                 var keyword = inputObj.val();
                 if (keyword)
                 {
-                    window.location = '/#/search?keywords=' + keyword +
+                    window.location = '/#/search?keywords=' + btoa(keyword) +
                         '&category=Datasets&source=default&page=1';
                 }
             }