From 1167d0d398062387f6f89bd165815088ecddaf93 Mon Sep 17 00:00:00 2001
From: astroshim <hsshim@nflabs.com>
Date: Sun, 5 Jun 2016 23:48:41 +0900
Subject: [PATCH 1/4] filtering subdirectory names.

---
 .../components/navbar/navbar.controller.js    | 40 ++++++++++++++++++-
 .../src/components/navbar/navbar.html         |  5 +--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js
index 50c769f1c3c..ea401d974ca 100644
--- a/zeppelin-web/src/components/navbar/navbar.controller.js
+++ b/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -14,7 +14,45 @@
 
 'use strict';
 
-angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootScope, $http, $routeParams,
+angular.module('zeppelinWebApp')
+.filter('notebookFilter', function() {
+  return function (notebooks, searchText)
+  {
+    if (!searchText) {
+      return notebooks;
+    }
+
+    var filteringNote = function(notebooks, filteredNotes) {
+      _.each(notebooks, function(notebook) {
+
+        if (notebook.name.toLowerCase().indexOf(searchText) != -1) {
+          filteredNotes.push(notebook);
+          return notebook;
+        }
+
+        if(notebook.children) { 
+          filteringNote(notebook.children, filteredNotes);
+        }
+      });
+    }
+
+    return _.filter(notebooks, function(notebook) {
+      if (notebook.children) {
+        var filteredNotes = [];
+        filteringNote(notebook.children, filteredNotes);
+
+        if (filteredNotes.length > 0) {
+          return filteredNotes;
+        }
+      }
+
+      if(notebook.name.toLowerCase().indexOf(searchText) != -1) {
+        return notebook;
+      }
+    });
+  }
+})
+.controller('NavCtrl', function($scope, $rootScope, $http, $routeParams,
     $location, notebookListDataFactory, baseUrlSrv, websocketMsgSrv, arrayOrderingSrv) {
   /** Current list of notes (ids) */
 
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index 148d67d3311..77de742c0bf 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -43,9 +43,8 @@
             <li><a href="" data-toggle="modal" data-target="#noteNameModal"><i class="fa fa-plus"></i> Create new note</a></li>
             <li class="divider"></li>
             <div id="notebook-list" class="scrollbar-container">
-              <li class="filter-names" ng-include="'components/filterNoteNames/filter-note-names.html'"></li>
-              <li ng-repeat="note in navbar.notes.root.children | filter:query track by $index" ng-class="{'active' : navbar.isActive(note.id)}" ng-include="'notebook_list_renderer.html'">
-              </li>
+              <li class="filter-names"><input type="text" class="note-name-query form-control" ng-click="$event.stopPropagation()" placeholder="&#xf002 Filter" ng-model="searchQuery"> </li>
+              <li ng-repeat="note in navbar.notes.root.children |notebookFilter:searchQuery track by $index" ng-class="{'active' : navbar.isActive(note.id)}" ng-include="'notebook_list_renderer.html'"></li>
             </div>
           </ul>
         </li>

From 3337385d81bb3f25f7ea6c8baf235d6357394b78 Mon Sep 17 00:00:00 2001
From: astroshim <hsshim@nflabs.com>
Date: Mon, 6 Jun 2016 01:07:53 +0900
Subject: [PATCH 2/4] fix jshint error

---
 zeppelin-web/src/components/navbar/navbar.controller.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js
index ea401d974ca..4f559b323aa 100644
--- a/zeppelin-web/src/components/navbar/navbar.controller.js
+++ b/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -25,7 +25,7 @@ angular.module('zeppelinWebApp')
     var filteringNote = function(notebooks, filteredNotes) {
       _.each(notebooks, function(notebook) {
 
-        if (notebook.name.toLowerCase().indexOf(searchText) != -1) {
+        if (notebook.name.toLowerCase().indexOf(searchText) !== -1) {
           filteredNotes.push(notebook);
           return notebook;
         }
@@ -34,7 +34,7 @@ angular.module('zeppelinWebApp')
           filteringNote(notebook.children, filteredNotes);
         }
       });
-    }
+    };
 
     return _.filter(notebooks, function(notebook) {
       if (notebook.children) {
@@ -46,11 +46,11 @@ angular.module('zeppelinWebApp')
         }
       }
 
-      if(notebook.name.toLowerCase().indexOf(searchText) != -1) {
+      if(notebook.name.toLowerCase().indexOf(searchText) !== -1) {
         return notebook;
       }
     });
-  }
+  };
 })
 .controller('NavCtrl', function($scope, $rootScope, $http, $routeParams,
     $location, notebookListDataFactory, baseUrlSrv, websocketMsgSrv, arrayOrderingSrv) {

From d963af84c9ad59fe56754b4fdb526d101dba6eb1 Mon Sep 17 00:00:00 2001
From: astroshim <hsshim@nflabs.com>
Date: Tue, 7 Jun 2016 11:04:07 +0900
Subject: [PATCH 3/4] add space.

---
 zeppelin-web/src/components/navbar/navbar.controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js
index 4f559b323aa..fb5957addba 100644
--- a/zeppelin-web/src/components/navbar/navbar.controller.js
+++ b/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -30,7 +30,7 @@ angular.module('zeppelinWebApp')
           return notebook;
         }
 
-        if(notebook.children) { 
+        if (notebook.children) { 
           filteringNote(notebook.children, filteredNotes);
         }
       });
@@ -46,7 +46,7 @@ angular.module('zeppelinWebApp')
         }
       }
 
-      if(notebook.name.toLowerCase().indexOf(searchText) !== -1) {
+      if (notebook.name.toLowerCase().indexOf(searchText) !== -1) {
         return notebook;
       }
     });

From 7b7b260581d37033d7dfbe70e09168ac3e759042 Mon Sep 17 00:00:00 2001
From: astroshim <hsshim@nflabs.com>
Date: Sat, 11 Jun 2016 00:58:35 +0900
Subject: [PATCH 4/4] code refatoring

---
 .../src/components/filterNoteNames/filter-note-names.html     | 2 +-
 zeppelin-web/src/components/navbar/navbar.html                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html b/zeppelin-web/src/components/filterNoteNames/filter-note-names.html
index a354cda70b8..f8fd22f2e52 100644
--- a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html
+++ b/zeppelin-web/src/components/filterNoteNames/filter-note-names.html
@@ -11,4 +11,4 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<input type="text" class="note-name-query form-control" ng-click="$event.stopPropagation()" placeholder="&#xf002 Filter" ng-model="$parent.query.name" />
+<input type="text" class="note-name-query form-control" ng-click="$event.stopPropagation()" placeholder="&#xf002 Filter" ng-model="$parent.query" />
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index 77de742c0bf..c6f5e36f8e6 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -43,8 +43,8 @@
             <li><a href="" data-toggle="modal" data-target="#noteNameModal"><i class="fa fa-plus"></i> Create new note</a></li>
             <li class="divider"></li>
             <div id="notebook-list" class="scrollbar-container">
-              <li class="filter-names"><input type="text" class="note-name-query form-control" ng-click="$event.stopPropagation()" placeholder="&#xf002 Filter" ng-model="searchQuery"> </li>
-              <li ng-repeat="note in navbar.notes.root.children |notebookFilter:searchQuery track by $index" ng-class="{'active' : navbar.isActive(note.id)}" ng-include="'notebook_list_renderer.html'"></li>
+              <li class="filter-names" ng-include="'components/filterNoteNames/filter-note-names.html'"></li>
+              <li ng-repeat="note in navbar.notes.root.children |notebookFilter:query track by $index" ng-class="{'active' : navbar.isActive(note.id)}" ng-include="'notebook_list_renderer.html'"></li>
             </div>
           </ul>
         </li>