Add load dialog to discover, Re: #31

elastic · Apr 21, 2014 · 301faba · 301faba
1 parent fae20ba
commit 301faba
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/src/kibana/apps/discover/controllers/discover.js b/src/kibana/apps/discover/controllers/discover.js
@@ -4,6 +4,8 @@ define(function (require) {
   var moment = require('moment');
   var settingsHtml = require('text!../partials/settings.html');
   var saveHtml = require('text!../partials/save_search.html');
+  var loadHtml = require('text!../partials/load_search.html');
+
   var interval = require('utils/interval');
   var datemath = require('utils/datemath');
 
@@ -58,6 +60,8 @@ define(function (require) {
       index: config.get('defaultIndex'),
     };
 
+    console.log(stateDefaults);
+
     var $state = $scope.state = new SyncedState(stateDefaults);
 
     // Check that we have any index patterns before going further, and that index being requested
@@ -200,6 +204,15 @@ define(function (require) {
       }
     };
 
+    $scope.toggleLoad = function () {
+      // Close if already open
+      if ($scope.configTemplate === loadHtml) {
+        delete $scope.configTemplate;
+      } else {
+        $scope.configTemplate = loadHtml;
+      }
+    };
+
     $scope.resetQuery = function () {
       $state.query = stateDefaults.query;
       $state.sort = stateDefaults.sort;

diff --git a/src/kibana/apps/discover/index.html b/src/kibana/apps/discover/index.html
@@ -3,6 +3,8 @@
     <ul class="nav navbar-nav navbar-right">
       <li><a class="navbar-link" ng-click="resetQuery()"><i class="fa fa-ban"></i></a></li>
       <li><a class="navbar-link" ng-click="toggleSave()"><i class="fa fa-save"></i></a></li>
+      <li><a class="navbar-link" ng-click="toggleLoad()"><i class="fa fa-folder"></i></a></li>
+
       <li><a class="navbar-link" ng-click="toggleConfig()"><i class="fa fa-gear"></i></a></li>
     </ul>
     <form class="navbar-form" ng-submit="fetch()">

diff --git a/src/kibana/apps/discover/partials/load_search.html b/src/kibana/apps/discover/partials/load_search.html
@@ -0,0 +1 @@
+<saved-object-finder title="Load" type="searches"></saved-object-finder>
diff --git a/src/kibana/apps/discover/saved_searches/saved_searches.js b/src/kibana/apps/discover/saved_searches/saved_searches.js
@@ -24,11 +24,22 @@ define(function (require) {
         type: 'search',
         body: {
           query: {
-            multi_match: {
-              query: searchString || '',
-              type: 'phrase_prefix',
-              fields: ['title^3', 'description'],
-              zero_terms_query: 'all'
+            bool: {
+              should : [
+                {
+                  wildcard: {
+                    title: {
+                      value: searchString + '*',
+                      boost: 3
+                    }
+                  }
+                },
+                {
+                  wildcard: {
+                    description: searchString + '*'
+                  }
+                },
+              ],
             }
           }
         }