You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by co...@apache.org on 2016/07/06 04:11:05 UTC
zeppelin git commit: [ZEPPELIN-1077] remove filter query on link
change
Repository: zeppelin
Updated Branches:
refs/heads/master c66943e44 -> 97e6293a5
[ZEPPELIN-1077] remove filter query on link change
### What is this PR for?
When filtering a note-name under notebook menu through navbar, the note-name query remains as it is , when clicked on any other link.
### What type of PR is it?
[Bug Fix]
### Todos
### What is the Jira issue?
[[ZEPPELIN-1077]](https://issues.apache.org/jira/browse/ZEPPELIN-1077)
### How should this be tested?
1. Open the notebook menu under navbar and search for any notebook.
2. Refer to any other page like interpreter,credentials .
3. The filter query under notebook menu resets on click of any other link.
### Screenshots (if appropriate)
**BEFORE:**
http://g.recordit.co/4tuS8yAAPR.gif
**AFTER:**
http://g.recordit.co/IZUR8mBUFs.gif
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Shiv Shankar Subudhi <sh...@osmcult.com>
Closes #1107 from suvam97/ZEPPELIN-1077 and squashes the following commits:
7df7b9f [Shiv Shankar Subudhi] Filter-query modified in homepage
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/97e6293a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/97e6293a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/97e6293a
Branch: refs/heads/master
Commit: 97e6293a55fbd74cfcdbfcc4b9b30447f20a0b32
Parents: c66943e
Author: Shiv Shankar Subudhi <sh...@osmcult.com>
Authored: Fri Jul 1 14:20:50 2016 +0530
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Wed Jul 6 13:10:53 2016 +0900
----------------------------------------------------------------------
zeppelin-web/src/app/home/home.html | 4 ++--
.../src/components/filterNoteNames/filter-note-names.html | 2 +-
zeppelin-web/src/components/navbar/navbar.controller.js | 5 +++++
zeppelin-web/src/components/navbar/navbar.html | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/97e6293a/zeppelin-web/src/app/home/home.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/home/home.html b/zeppelin-web/src/app/home/home.html
index b158f63..c53813a 100644
--- a/zeppelin-web/src/app/home/home.html
+++ b/zeppelin-web/src/app/home/home.html
@@ -59,7 +59,7 @@ limitations under the License.
<i style="font-size: 15px;" class="icon-notebook"></i> Create new note</a></h5>
<ul id="notebook-names">
<li class="filter-names" ng-include="'components/filterNoteNames/filter-note-names.html'"></li>
- <li ng-repeat="note in home.notes.list | filter:query | orderBy:home.arrayOrderingSrv.notebookListOrdering track by $index">
+ <li ng-repeat="note in home.notes.list | filter:query.q | orderBy:home.arrayOrderingSrv.notebookListOrdering track by $index">
<i style="font-size: 10px;" class="icon-doc"></i>
<a style="text-decoration: none;" href="#/notebook/{{note.id}}">{{noteName(note)}}</a>
</li>
@@ -67,7 +67,7 @@ limitations under the License.
<li ng-repeat="node in home.notes.root.children | orderBy:home.arrayOrderingSrv.notebookListOrdering track by $index" ng-include="'notebook_folder_renderer.html'" />
</div>
<div ng-if="query && query.name !== ''">
- <li ng-repeat="note in home.notes.flatList | filter:query | orderBy:home.arrayOrderingSrv.notebookListOrdering track by $index">
+ <li ng-repeat="note in home.notes.flatList | filter:query.q | orderBy:home.arrayOrderingSrv.notebookListOrdering track by $index">
<i style="font-size: 10px;" class="icon-doc"></i>
<a style="text-decoration: none;" href="#/notebook/{{note.id}}">{{noteName(note)}}</a>
</li>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/97e6293a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html b/zeppelin-web/src/components/filterNoteNames/filter-note-names.html
index f8fd22f..e8cc2ef 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 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
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=" Filter" ng-model="$parent.query" />
+<input type="text" class="note-name-query form-control" ng-click="$event.stopPropagation()" placeholder=" Filter" ng-model="$parent.query.q" />
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/97e6293a/zeppelin-web/src/components/navbar/navbar.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js
index f13681e..702a257 100644
--- a/zeppelin-web/src/components/navbar/navbar.controller.js
+++ b/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -18,6 +18,7 @@ angular.module('zeppelinWebApp')
.controller('NavCtrl', function($scope, $rootScope, $http, $routeParams,
$location, notebookListDataFactory, baseUrlSrv, websocketMsgSrv, arrayOrderingSrv, searchService) {
+ $scope.query = {q : '' };
/** Current list of notes (ids) */
$scope.showLoginWindow = function() {
@@ -35,6 +36,10 @@ angular.module('zeppelinWebApp')
angular.element('#notebook-list').perfectScrollbar({suppressScrollX: true});
+ angular.element(document).click(function(){
+ $scope.query.q = '';
+ });
+
$scope.$on('setNoteMenu', function(event, notes) {
notebookListDataFactory.setNotes(notes);
});
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/97e6293a/zeppelin-web/src/components/navbar/navbar.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index e365324..be88a9b 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -32,7 +32,7 @@ limitations under the License.
<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 | orderBy:navbar.arrayOrderingSrv.notebookListOrdering track by $index"
+ <li ng-repeat="note in navbar.notes.root.children | filter:query.q | orderBy:navbar.arrayOrderingSrv.notebookListOrdering track by $index"
ng-class="{'active' : navbar.isActive(note.id)}" ng-include="'components/navbar/navbar-notebookList-elem.html'">
</li>
</div>