redirect to notebook and scroll to paragraph from search view

felizbear · bzz · commit 1e1357c02cf5 · 2015-12-15T18:59:16.000+09:00
diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js
@@ -51,6 +51,10 @@ angular.module('zeppelinWebApp', [
         templateUrl: 'app/notebook/notebook.html',
         controller: 'NotebookCtrl'
       })
+      .when('/notebook/:noteId/paragraph?=:paragraphId', {
+        templateUrl: 'app/notebook/notebook.html',
+        controller: 'NotebookCtrl'
+      })
       .when('/notebook/:noteId/paragraph/:paragraphId?', {
         templateUrl: 'app/notebook/notebook.html',
         controller: 'NotebookCtrl'
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -1,4 +1,5 @@
 /* jshint loopfunc: true */
+/* global $: false */
 /*
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
  */
 'use strict';
 
-angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $route, $routeParams, $location,
-                                                                     $rootScope, $http, websocketMsgSrv, baseUrlSrv,
-                                                                     $timeout, SaveAsService) {
+angular.module('zeppelinWebApp').controller('NotebookCtrl',
+  function($scope, $route, $routeParams, $location, $rootScope, $http,
+    websocketMsgSrv, baseUrlSrv, $timeout, SaveAsService) {
   $scope.note = null;
   $scope.showEditor = false;
   $scope.editorToggled = false;
@@ -66,6 +67,21 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
   /** Init the new controller */
   var initNotebook = function() {
     websocketMsgSrv.getNotebook($routeParams.noteId);
+
+    var currentRoute = $route.current;
+
+    if (currentRoute) {
+      var routeParams = currentRoute.params;
+      var id = '#' + routeParams.paragraph + '_container';
+      setTimeout(
+        function() {
+          // adjust for navbar
+          var top = $(id).offset().top - 103;
+          $('html, body').scrollTo({top: top, left: 0});
+        },
+        1000
+      );
+    }
   };
 
   initNotebook();
@@ -314,11 +330,11 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro
   $scope.$on('insertParagraph', function(event, paragraphId, position) {
     var newIndex = -1;
     for (var i=0; i<$scope.note.paragraphs.length; i++) {
-      if ( $scope.note.paragraphs[i].id === paragraphId ) {        
+      if ( $scope.note.paragraphs[i].id === paragraphId ) {
         //determine position of where to add new paragraph; default is below
-        if ( position === 'above' ) {         
+        if ( position === 'above' ) {
           newIndex = i;
-        } else {     
+        } else {
           newIndex = i+1;
         }
         break;
diff --git a/zeppelin-web/src/app/search/result-list.controller.js b/zeppelin-web/src/app/search/result-list.controller.js
@@ -20,9 +20,14 @@ angular
 
   var results = searchService.search({'q': $routeParams.searchTerm}).query();
 
-  console.log('Found: %o', results);
   results.$promise.then(function(result) {
-    $scope.notes = result.body;
+    $scope.notes = result.body.map(function(note) {
+      note.id = note.id.replace('paragraph/', '?paragraph=') +
+        '&term=' +
+        $routeParams.searchTerm;
+
+      return note;
+    });
   });
 
   $scope.page = 0;
