From 7315707b391db8e415980f1c2a1454afca4394d7 Mon Sep 17 00:00:00 2001
From: Ravi Ranjan <ranjanravi0308@gmail.com>
Date: Thu, 9 Jun 2016 15:38:26 +0530
Subject: [PATCH 1/4] Handle empty search

---
 .../src/app/search/result-list.controller.js     | 16 +++++++++++++++-
 zeppelin-web/src/app/search/result-list.html     |  6 +++++-
 zeppelin-web/src/app/search/search.css           |  9 +++++++++
 zeppelin-web/src/components/navbar/navbar.html   |  1 +
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/zeppelin-web/src/app/search/result-list.controller.js b/zeppelin-web/src/app/search/result-list.controller.js
index 949e01f50b1..2de139db7d4 100644
--- a/zeppelin-web/src/app/search/result-list.controller.js
+++ b/zeppelin-web/src/app/search/result-list.controller.js
@@ -16,8 +16,10 @@
 
 angular
   .module('zeppelinWebApp')
-  .controller('SearchResultCtrl', function($scope, $routeParams, searchService) {
+  .controller('SearchResultCtrl', function($scope, $routeParams, searchService, $rootScope) {
 
+  $scope.isResult = true ;
+  $scope.searchTerm = $routeParams.searchTerm;
   var results = searchService.search({'q': $routeParams.searchTerm}).query();
 
   results.$promise.then(function(result) {
@@ -34,6 +36,18 @@ angular
 
       return note;
     });
+    if ($scope.notes.length === 0) {
+      $scope.isResult = false;
+    } else {
+      $scope.isResult = true;
+    }
+
+    var routeChangeEvent = $rootScope.$on('$routeChangeStart', function (event, next, current) {
+      if (next.originalPath !== '/search/:searchTerm') {
+        angular.element('#searchTermId').val('');
+        routeChangeEvent();
+      }
+    });
   });
 
   $scope.page = 0;
diff --git a/zeppelin-web/src/app/search/result-list.html b/zeppelin-web/src/app/search/result-list.html
index 87fce5340b9..38c291200af 100644
--- a/zeppelin-web/src/app/search/result-list.html
+++ b/zeppelin-web/src/app/search/result-list.html
@@ -12,7 +12,7 @@
 limitations under the License.
 -->
 <div ng-controller="SearchResultCtrl" class="searchResults">
-  <div class="row">
+    <div ng-if="isResult" class="row">
     <div class="col-sm-8" style="margin: 0 auto; float: none">
       <ul class="search-results">
         <li class="panel panel-default" ng-repeat="note in notes">
@@ -37,6 +37,10 @@ <h4>
           </div>
           </div>
        </li>
+      </ul>
     </div>
   </div>
+  <div ng-if="!isResult" class="search-no-result-found">
+      <span class="glyphicon glyphicon-search"></span> We couldn’t find any notebook matching <b>'{{searchTerm}}' </b>
+  </div>
 </div>
diff --git a/zeppelin-web/src/app/search/search.css b/zeppelin-web/src/app/search/search.css
index b06b4a94a0c..90a7a3f41d6 100644
--- a/zeppelin-web/src/app/search/search.css
+++ b/zeppelin-web/src/app/search/search.css
@@ -40,3 +40,12 @@
 .search-results .ace_invalid {
   background: none !important;
 }
+
+.search-no-result-found {
+  border: 1px solid;
+  margin: 150px 150px;
+  padding: 15px 10px 15px 0px;
+  color: #00529B;
+  text-align: center;
+  background-color: #f4f6f8;
+}
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index 148d67d3311..e3d71e72fd0 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -71,6 +71,7 @@
               <input
                 type="text"
                 ng-model="searchTerm"
+                id="searchTermId"
                 ng-disabled="!navbar.connected"
                 class="form-control"
                 placeholder="Search in your notebooks"

From 5d5a072bd4c61a362f5a9c5c593a2d9769dcfb9d Mon Sep 17 00:00:00 2001
From: Ravi Ranjan <ranjanravi0308@gmail.com>
Date: Mon, 13 Jun 2016 11:11:09 +0530
Subject: [PATCH 2/4] add check on searchTerm and clan up scope

---
 zeppelin-web/src/app/search/result-list.controller.js   | 1 +
 zeppelin-web/src/components/navbar/navbar.controller.js | 2 ++
 zeppelin-web/src/components/navbar/navbar.html          | 8 ++++----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/zeppelin-web/src/app/search/result-list.controller.js b/zeppelin-web/src/app/search/result-list.controller.js
index 2de139db7d4..528ec3d60c8 100644
--- a/zeppelin-web/src/app/search/result-list.controller.js
+++ b/zeppelin-web/src/app/search/result-list.controller.js
@@ -45,6 +45,7 @@ angular
     var routeChangeEvent = $rootScope.$on('$routeChangeStart', function (event, next, current) {
       if (next.originalPath !== '/search/:searchTerm') {
         angular.element('#searchTermId').val('');
+        $rootScope.searchForm.searchTerm = '';
         routeChangeEvent();
       }
     });
diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js
index 50c769f1c3c..38df248e917 100644
--- a/zeppelin-web/src/components/navbar/navbar.controller.js
+++ b/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -24,11 +24,13 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco
     }, 500);
   };
 
+
   var vm = this;
   vm.notes = notebookListDataFactory;
   vm.connected = websocketMsgSrv.isConnected();
   vm.websocketMsgSrv = websocketMsgSrv;
   vm.arrayOrderingSrv = arrayOrderingSrv;
+  $rootScope.searchForm = {};
   if ($rootScope.ticket) {
     $rootScope.fullUsername = $rootScope.ticket.principal;
     $rootScope.truncatedUsername = $rootScope.ticket.principal;
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index e3d71e72fd0..56eecc54f16 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -64,13 +64,13 @@
       <ul class="nav navbar-nav navbar-right" style="margin-top:10px; margin-right:5px;">
         <li ng-if="ticket">
         <!--TODO(bzz): move to Typeahead https://angular-ui.github.io/bootstrap  -->
-          <form role="search"
+          <form role="search" data-ng-model="searchForm"
             style="width: 300px; display: inline-block; margin: 0 10px"
-             ng-submit="search(searchTerm)">
+             ng-submit="search(searchForm.searchTerm)">
             <div class="input-group">
               <input
                 type="text"
-                ng-model="searchTerm"
+                ng-model="searchForm.searchTerm"
                 id="searchTermId"
                 ng-disabled="!navbar.connected"
                 class="form-control"
@@ -80,7 +80,7 @@
                 <button
                   type="submit"
                   class="btn btn-default"
-                  ng-disabled="!navbar.connected"
+                  ng-disabled="!navbar.connected || !searchForm.searchTerm"
                 >
                   <i class="glyphicon glyphicon-search"></i>
                 </button>

From 6c3db2c4e2ccb8c08cc33cc361c5a6037f4d4975 Mon Sep 17 00:00:00 2001
From: Ravi Ranjan <ranjanravi0308@gmail.com>
Date: Mon, 13 Jun 2016 17:41:42 +0530
Subject: [PATCH 3/4] use searchServise in place of rootscope

---
 zeppelin-web/src/app/search/result-list.controller.js      | 7 +++----
 zeppelin-web/src/components/navbar/navbar.controller.js    | 5 +++--
 .../src/components/searchService/search.service.js         | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/zeppelin-web/src/app/search/result-list.controller.js b/zeppelin-web/src/app/search/result-list.controller.js
index b3fb15a8b91..c56bd13e18d 100644
--- a/zeppelin-web/src/app/search/result-list.controller.js
+++ b/zeppelin-web/src/app/search/result-list.controller.js
@@ -42,11 +42,10 @@ angular
       $scope.isResult = true;
     }
 
-    var routeChangeEvent = $rootScope.$on('$routeChangeStart', function (event, next, current) {
+    var unbindRouteChangeEvent = $scope.$on('$routeChangeStart', function (event, next, current) {
       if (next.originalPath !== '/search/:searchTerm') {
-        angular.element('#searchTermId').val('');
-        $rootScope.searchForm.searchTerm = '';
-        routeChangeEvent();
+        searchService.searchTerm = '';
+        unbindRouteChangeEvent();
       }
     });
   });
diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js
index 4630c825eaa..bd1cb216beb 100644
--- a/zeppelin-web/src/components/navbar/navbar.controller.js
+++ b/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -15,7 +15,7 @@
 'use strict';
 
 angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootScope, $http, $routeParams,
-    $location, notebookListDataFactory, baseUrlSrv, websocketMsgSrv, arrayOrderingSrv) {
+    $location, notebookListDataFactory, baseUrlSrv, websocketMsgSrv, arrayOrderingSrv, searchService) {
   /** Current list of notes (ids) */
 
   $scope.showLoginWindow = function() {
@@ -30,7 +30,8 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco
   vm.connected = websocketMsgSrv.isConnected();
   vm.websocketMsgSrv = websocketMsgSrv;
   vm.arrayOrderingSrv = arrayOrderingSrv;
-  $rootScope.searchForm = {};
+  $scope.searchForm = searchService;
+
   if ($rootScope.ticket) {
     $rootScope.fullUsername = $rootScope.ticket.principal;
     $rootScope.truncatedUsername = $rootScope.ticket.principal;
diff --git a/zeppelin-web/src/components/searchService/search.service.js b/zeppelin-web/src/components/searchService/search.service.js
index 920b5e08a52..4aced31bac1 100644
--- a/zeppelin-web/src/components/searchService/search.service.js
+++ b/zeppelin-web/src/components/searchService/search.service.js
@@ -26,4 +26,6 @@ angular.module('zeppelinWebApp').service('searchService', function($resource, ba
     });
   };
 
+  this.searchTerm = '';
+
 });

From cab339d5b155521d702b56630f5aa230808e7367 Mon Sep 17 00:00:00 2001
From: Ravi Ranjan <ranjanravi0308@gmail.com>
Date: Tue, 14 Jun 2016 14:15:32 +0530
Subject: [PATCH 4/4] Remove controller , add update  searchTerm, remove
 deregistration function remove rootscope

---
 zeppelin-web/src/app/search/result-list.controller.js       | 5 ++---
 zeppelin-web/src/app/search/result-list.html                | 2 +-
 zeppelin-web/src/components/searchService/search.service.js | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zeppelin-web/src/app/search/result-list.controller.js b/zeppelin-web/src/app/search/result-list.controller.js
index c56bd13e18d..2edf9f55fc1 100644
--- a/zeppelin-web/src/app/search/result-list.controller.js
+++ b/zeppelin-web/src/app/search/result-list.controller.js
@@ -16,7 +16,7 @@
 
 angular
   .module('zeppelinWebApp')
-  .controller('SearchResultCtrl', function($scope, $routeParams, searchService, $rootScope) {
+  .controller('SearchResultCtrl', function($scope, $routeParams, searchService) {
 
   $scope.isResult = true ;
   $scope.searchTerm = $routeParams.searchTerm;
@@ -42,10 +42,9 @@ angular
       $scope.isResult = true;
     }
 
-    var unbindRouteChangeEvent = $scope.$on('$routeChangeStart', function (event, next, current) {
+  $scope.$on('$routeChangeStart', function (event, next, current) {
       if (next.originalPath !== '/search/:searchTerm') {
         searchService.searchTerm = '';
-        unbindRouteChangeEvent();
       }
     });
   });
diff --git a/zeppelin-web/src/app/search/result-list.html b/zeppelin-web/src/app/search/result-list.html
index 38c291200af..67b0d7c6f71 100644
--- a/zeppelin-web/src/app/search/result-list.html
+++ b/zeppelin-web/src/app/search/result-list.html
@@ -11,7 +11,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<div ng-controller="SearchResultCtrl" class="searchResults">
+<div class="searchResults">
     <div ng-if="isResult" class="row">
     <div class="col-sm-8" style="margin: 0 auto; float: none">
       <ul class="search-results">
diff --git a/zeppelin-web/src/components/searchService/search.service.js b/zeppelin-web/src/components/searchService/search.service.js
index 4aced31bac1..d026404053f 100644
--- a/zeppelin-web/src/components/searchService/search.service.js
+++ b/zeppelin-web/src/components/searchService/search.service.js
@@ -16,6 +16,7 @@
 angular.module('zeppelinWebApp').service('searchService', function($resource, baseUrlSrv) {
 
   this.search = function(term) {
+    this.searchTerm = term.q;
      console.log('Searching for: %o', term.q);
     if (!term.q) { //TODO(bzz): empty string check
       return;