Seperated search saving into its own dialog, added form validation. C…

…loses #34, closes #47

src/kibana/apps/discover/controllers/discover.js

@@ -3,6 +3,7 @@ define(function (require) {
   var angular = require('angular');
   var moment = require('moment');
   var settingsHtml = require('text!../partials/settings.html');
+  var saveHtml = require('text!../partials/save_search.html');
   var interval = require('utils/interval');
   var datemath = require('utils/datemath');
 
@@ -181,11 +182,6 @@ define(function (require) {
       if (changed.length === 0) courier.fetch();
     };
 
-    // $scope.$watch('state.index', $scope.fetch);
-    // $scope.$watch('state.query', $scope.fetch);
-
-    // $scope.$watch('state.columns', $scope.fetch);
-
     $scope.toggleConfig = function () {
       // Close if already open
       if ($scope.configTemplate === settingsHtml) {
@@ -195,6 +191,15 @@ define(function (require) {
       }
     };
 
+    $scope.toggleSave = function () {
+      // Close if already open
+      if ($scope.configTemplate === saveHtml) {
+        delete $scope.configTemplate;
+      } else {
+        $scope.configTemplate = saveHtml;
+      }
+    };
+
     $scope.resetQuery = function () {
       $state.query = stateDefaults.query;
       $state.sort = stateDefaults.sort;

src/kibana/apps/discover/index.html

@@ -2,6 +2,7 @@
   <nav class="navbar navbar-default navbar-static-top subnav">
     <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="toggleConfig()"><i class="fa fa-gear"></i></a></li>
     </ul>
     <form class="navbar-form" ng-submit="fetch()">

src/kibana/apps/discover/partials/save_search.html

@@ -0,0 +1,15 @@
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <div class="form-group">
+        <label class="control-label">Save Search</label>
+        <input ng-model="opts.savedSearch.title" class="form-control" placeholder="Name this search...">
+      </div>
+      <div class="form-group">
+        <button ng-click="opts.saveDataSource()" ng-disabled="!opts.savedSearch.title" type="submit" class="btn btn-primary">
+          Save
+        </button>
+      </div>
+    </div>
+  </div>
+</div>

src/kibana/apps/discover/partials/settings.html

@@ -1,16 +1,5 @@
 <div class="container-fluid">
   <div class="row">
-    <div class="col-md-9">
-      <div class="form-group">
-        <label class="control-label">Save Search</label>
-        <input ng-model="opts.savedSearch.title" class="form-control">
-      </div>
-      <div class="form-group">
-        <button ng-click="opts.saveDataSource()" type="button" class="btn btn-primary">
-          {{opts.savedSearch.id ? 'Create' : 'Save'}}
-        </button>
-      </div>
-    </div>
     <div class="col-md-3">
       <label class="control-label">Index Pattern <a class="small" ng-href="#/settings/indices/{{opts.index}}">Configure Pattern</a>
 </label>