Search: disabling UI on disconnect

bzz · bzz · commit 3900b60c76f8 · 2015-12-15T18:58:14.000+09:00
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
@@ -388,13 +388,14 @@ public Response getCronJob(@PathParam("notebookId") String notebookId) throws
   }  
 
  /**
- * Search for a Note
+ * Search for a Notes
  */
  @GET
  @Path("search")
  public Response search(@QueryParam("q") String query) {
    logger.info("Searching notebooks for {}", query);
    Map<String, String> notebooksFound = searchNotebooks(query);
+   logger.info("Notbooks {} found", notebooksFound.size());
    return new JsonResponse<>(Status.OK, notebooksFound).build();
  }
 
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
@@ -50,10 +50,10 @@
          ng-submit="search()">
 
         <div class="form-group">
-          <input type="text" ng-model="searchTerm"
+          <input type="text" ng-model="searchTerm" ng-disabled="!navbar.connected"
              class="form-control" placeholder="Search your notebooks">
         </div>
-        <button type="submit" class="btn btn-default">
+        <button type="submit" class="btn btn-default" ng-disabled="!navbar.connected">
           Search
         </button>
       </form>
diff --git a/zeppelin-web/src/components/searchService/search.service.js b/zeppelin-web/src/components/searchService/search.service.js
@@ -24,7 +24,7 @@ angular.module('zeppelinWebApp').service('searchService', function($http, baseUr
     $http
       .get(baseUrlSrv.getRestApiBase() + '/notebook/search?q=' + encQuery)
       .then(function successCallback(response) {
-        console.log('Found: %o', response);
+        console.log('Found: %o', response.data.body);
         //TODO(bzz): navigate to SearchResult page/controller
       }, function errorCallback(response) {
         console.log('Error: %o', response);

Original file line number	Diff line number	Diff line change
`@@ -388,13 +388,14 @@ public Response getCronJob(@PathParam("notebookId") String notebookId) throws`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`/**`
`391`		`- * Search for a Note`
	`391`	`+ * Search for a Notes`
`392`	`392`	`*/`
`393`	`393`	`@GET`
`394`	`394`	`@Path("search")`
`395`	`395`	`public Response search(@QueryParam("q") String query) {`
`396`	`396`	`logger.info("Searching notebooks for {}", query);`
`397`	`397`	`Map<String, String> notebooksFound = searchNotebooks(query);`
	`398`	`+ logger.info("Notbooks {} found", notebooksFound.size());`
`398`	`399`	`return new JsonResponse<>(Status.OK, notebooksFound).build();`
`399`	`400`	`}`
`400`	`401`