Skip to content

filtering subdirectory names. #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
astroshim wants to merge 4 commits into from
Closed

filtering subdirectory names. #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1167d0d
filtering subdirectory names.
Jun 5, 2016
3337385
fix jshint error
Jun 5, 2016
d963af8
add space.
Jun 7, 2016
7b7b260
code refatoring
Jun 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zeppelin-web/src/components/filterNoteNames/filter-note-names.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
40 changes: 39 additions & 1 deletion zeppelin-web/src/components/navbar/navbar.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) */

Expand Down
3 changes: 1 addition & 2 deletions zeppelin-web/src/components/navbar/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
<li class="divider"></li>
<div id="notebook-list" class="scrollbar-container">
<li class="filter-names" ng-include="'components/filterNoteNames/filter-note-names.html'"></li>
Copy link
Contributor

@corneadoug corneadoug Jun 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should make keep that line, and modify filter-note-names.html to have ng-model="$parent.query"

<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 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>
Expand Down