Merge branch 'master' into fix/elastic#1903

src/kibana/components/agg_table/agg_table.html

@@ -1,38 +1,13 @@
-<paginate
+<paginated-table
   ng-if="formattedRows.length"
-
-  list="formattedRows"
-  per-page-prop="perPage"
-
-  class="agg-table">
-  <div class="agg-table-paginated">
-    <table class="table table-condensed">
-      <thead>
-        <tr bindonce>
-          <th
-            ng-repeat="col in table.columns"
-            ng-click="aggTable.cycleSort(col)"
-            ng-class="aggTable.getColumnClass(col, $first, $last)">
-            <span bo-text="col.title"></span>
-            <i
-              class="fa"
-              ng-class="{
-                'fa-sort-asc': aggTable.sort.col === col && aggTable.sort.asc,
-                'fa-sort-desc': aggTable.sort.col === col && !aggTable.sort.asc,
-                'fa-sort': !aggTable.sort || aggTable.sort.col !== col
-              }">
-            </i>
-          </th>
-        </tr>
-      </thead>
-      <tbody kbn-rows="page" kbn-rows-min="perPage"></tbody>
-    </table>
-  </div>
+  rows="formattedRows"
+  columns="formattedColumns"
+  per-page="perPage">
 
   <div class="agg-table-controls">
     <a class="small" ng-click="aggTable.exportAsCsv()">
       Export <i class="fa fa-download"></i>
     </a>
     <paginate-controls></paginate-controls>
   </div>
-</paginate>
+</paginated-table>

src/kibana/components/agg_table/agg_table.js

@@ -1,4 +1,5 @@
 define(function (require) {
+  require('components/paginated_table/paginated_table');
   require('services/compile_recursive_directive');
   require('css!components/agg_table/agg_table.css');
 
@@ -7,7 +8,6 @@ define(function (require) {
   .directive('kbnAggTable', function ($filter, config, Private, compileRecursiveDirective) {
     var _ = require('lodash');
 
-    var tabifyAggResponse = Private(require('components/agg_response/tabify/tabify'));
     var orderBy = $filter('orderBy');
 
     return {
@@ -33,42 +33,6 @@ define(function (require) {
           quoteValues: config.get('csv:quoteValues')
         };
 
-        self.getColumnClass = function (col, $first, $last) {
-          var cls = [];
-          var agg = $scope.table.aggConfig(col);
-
-          if ($last || (agg.schema.group === 'metrics')) {
-            cls.push('visualize-table-right');
-          }
-
-          if (!self.sort || self.sort.field !== col) {
-            cls.push('no-sort');
-          }
-
-          return cls.join(' ');
-        };
-
-        self.cycleSort = function (col) {
-          if (!self.sort || self.sort.col !== col) {
-            self.sort = {
-              col: col,
-              asc: true
-            };
-          } else if (self.sort.asc) {
-            self.sort.asc = false;
-          } else {
-            self.sort = null;
-          }
-
-          if (self.sort && !self.sort.getter) {
-            var colI = $scope.table.columns.indexOf(self.sort.col);
-            self.sort.getter = function (row) {
-              return row[colI];
-            };
-            if (colI === -1) self.sort = null;
-          }
-        };
-
         self.exportAsCsv = function () {
           var csv = new Blob([self.toCsv()], { type: 'text/plain' });
           self._saveAs(csv, self.csv.filename);
@@ -104,39 +68,51 @@ define(function (require) {
           }).join('');
         };
 
-        $scope.$watchMulti([
-          'table',
-          'aggTable.sort.asc',
-          'aggTable.sort.col'
-        ], function () {
+        $scope.$watch('table', function () {
           var table = $scope.table;
 
           if (!table) {
             $scope.formattedRows = null;
+            $scope.formattedColumns = null;
             return;
           }
 
+          setFormattedRows(table);
+          setFormattedColumns(table);
+        });
+
+        function setFormattedColumns(table) {
+          $scope.formattedColumns = table.columns.map(function (col, i) {
+            var formattedColumn = {
+              title: col.title
+            };
+
+            var agg = $scope.table.aggConfig(col);
+            var last = i === (table.columns.length - 1);
+
+            if (last || (agg.schema.group === 'metrics')) {
+              formattedColumn.class = 'visualize-table-right';
+            }
+
+            return formattedColumn;
+          });
+        }
+
+        function setFormattedRows(table) {
           var formatters = table.columns.map(function (col) {
             return table.fieldFormatter(col);
           });
 
-          // sort the row values, not formatted
-          if (self.sort) {
-            $scope.formattedRows = orderBy(table.rows, self.sort.getter, !self.sort.asc);
-          } else {
-            $scope.formattedRows = null;
-          }
-
           // format all row values
-          $scope.formattedRows = ($scope.formattedRows || table.rows).map(function (row) {
+          $scope.formattedRows = (table.rows).map(function (row) {
             return row.map(function (cell, i) {
               return formatters[i](cell);
             });
           });
 
           // update the csv file's title
           self.csv.filename = (table.title() || 'table') + '.csv';
-        });
+        }
       }
     };
   });

src/kibana/components/paginated_table/paginated_table.html

@@ -0,0 +1,35 @@
+<paginate
+  ng-if="sortedRows.length"
+  list="sortedRows"
+  per-page-prop="perPage"
+  class="agg-table">
+  <div class="agg-table-paginated">
+    <table class="table table-condensed">
+      <thead>
+        <tr bindonce>
+          <th
+            ng-repeat="col in columns"
+            ng-click="paginatedTable.sortColumn(col)"
+            class="{{ col.class }}">
+            <span bo-text="col.title"></span>
+            <kbn-info ng-if="col.info" info="{{ col.info }}" placement="top"></kbn-info>
+            <i
+              class="fa"
+              ng-class="{
+                'fa-sort-asc': paginatedTable.sort.columnName === col.title && paginatedTable.sort.direction === 'asc',
+                'fa-sort-desc': paginatedTable.sort.columnName === col.title && paginatedTable.sort.direction === 'desc',
+                'fa-sort': paginatedTable.sort.direction === null || paginatedTable.sort.columnName !== col.title
+              }">
+            </i>
+          </th>
+        </tr>
+      </thead>
+      <tbody kbn-rows="page" kbn-rows-min="perPage"></tbody>
+    </table>
+  </div>
+
+  <!-- auto-inserted by the paginate directive... -->
+  <!-- <paginate-controls></paginate-controls> -->
+  <div class="pagination-container" ng-transclude></div>
+
+</paginate>

src/kibana/components/paginated_table/paginated_table.js

@@ -0,0 +1,79 @@
+define(function (require) {
+  require('modules')
+  .get('kibana')
+  .directive('paginatedTable', function ($filter, config, Private) {
+    var _ = require('lodash');
+    var orderBy = $filter('orderBy');
+
+    return {
+      restrict: 'E',
+      template: require('text!components/paginated_table/paginated_table.html'),
+      transclude: true,
+      scope: {
+        rows: '=',
+        columns: '=',
+        perPage: '=?',
+        sortHandler: '=?',
+        showSelector: '=?'
+      },
+      controllerAs: 'paginatedTable',
+      controller: function ($scope) {
+        var self = this;
+        self.sort = {
+          columnName: null,
+          direction: null
+        };
+
+        self.sortColumn = function (col) {
+          var sortDirection;
+          var cols = _.pluck($scope.columns, 'title');
+          var index = cols.indexOf(col.title);
+
+          if (index === -1) return;
+
+          if (self.sort.columnName !== col.title) {
+            sortDirection = 'asc';
+          } else {
+            var directions = {
+              null: 'asc',
+              'asc': 'desc',
+              'desc': null
+            };
+            sortDirection = directions[self.sort.direction];
+          }
+
+          self.sort.columnName = col.title;
+          self.sort.direction = sortDirection;
+          self._setSortGetter(index);
+        };
+
+        self._setSortGetter = function (index) {
+          if (_.isFunction($scope.sortHandler)) {
+            // use custom sort handler
+            self.sort.getter = $scope.sortHandler(index);
+          } else {
+            // use generic sort handler
+            self.sort.getter = function (row) {
+              var value = row[index];
+              if (value.value) return value.value;
+              return value;
+            };
+          }
+        };
+
+        // update the sordedRows result
+        $scope.$watchMulti([
+          'paginatedTable.sort.direction',
+          'rows'
+        ], function () {
+          if (self.sort.direction == null) {
+            $scope.sortedRows = $scope.rows.slice(0);
+            return;
+          }
+
+          $scope.sortedRows = orderBy($scope.rows, self.sort.getter, self.sort.direction === 'desc');
+        });
+      }
+    };
+  });
+});

src/kibana/components/vis/vis.js

@@ -81,7 +81,8 @@ define(function (require) {
         params: this.params,
         aggs: this.aggs.map(function (agg) {
           return agg.toJSON();
-        }).filter(Boolean)
+        }).filter(Boolean),
+        listeners: this.listeners
       };
     };
 
@@ -99,4 +100,4 @@ define(function (require) {
 
     return Vis;
   };
-});
+});

src/kibana/components/vislib/lib/data.js

@@ -125,7 +125,7 @@ define(function (require) {
         var rootSeries = obj.series || (obj.slices && obj.slices.children);
         var dataLength = rootSeries ? rootSeries.length : 0;
         var label = dataLength === 1 ? rootSeries[0].label || rootSeries[0].name : undefined;
-        var children = (obj.slices && obj.slices.children && obj.slices.children[0].children);
+        var children = (obj.slices && obj.slices.children && obj.slices.children[0] && obj.slices.children[0].children);
 
         if (!seriesLabel) {
           seriesLabel = label;

src/kibana/components/visualize/spy/spy.js

@@ -17,7 +17,6 @@ define(function (require) {
         link: function ($scope, $el) {
           var $container = $el.find('.visualize-spy-container');
           var fullPageSpy = false;
-          // $scope.spyMode = null; // inherited from the parent
           $scope.modes = modes;
 
           $scope.toggleDisplay = function () {
@@ -36,38 +35,33 @@ define(function (require) {
             var current = $scope.spyMode;
             var change = false;
 
-            function set() {
-              // no change
-              if (current && newMode && newMode.name === current.name) return;
-
-              // clear the current value
-              if (current) {
-                current.$container.remove();
-                current.$scope.$destroy();
-                delete $scope.spyMode;
-                current = null;
-                change = true;
-              }
-
-              // no further changes
-              if (!newMode) return;
+            // no change
+            if (current && newMode && newMode.name === current.name) return;
 
+            // clear the current value
+            if (current) {
+              current.$container.remove();
+              current.$scope.$destroy();
+              delete $scope.spyMode;
+              current = null;
               change = true;
-              current = $scope.spyMode = {
-                // copy a couple values over
-                name: newMode.name,
-                display: newMode.display,
-                fill: fullPageSpy,
-                $scope: $scope.$new(),
-                $container: $('<div class="visualize-spy-content">').appendTo($container)
-              };
-
-              current.$container.append($compile(newMode.template)(current.$scope));
-              newMode.link && newMode.link(current.$scope, current.$container);
             }
 
-            // wrapped in fn to enable early return
-            set();
+            // no further changes
+            if (!newMode) return;
+
+            change = true;
+            current = $scope.spyMode = {
+              // copy a couple values over
+              name: newMode.name,
+              display: newMode.display,
+              fill: fullPageSpy,
+              $scope: $scope.$new(),
+              $container: $('<div class="visualize-spy-content">').appendTo($container)
+            };
+
+            current.$container.append($compile(newMode.template)(current.$scope));
+            newMode.link && newMode.link(current.$scope, current.$container);
           };
         }
       };

src/kibana/directives/paginate.js

@@ -69,7 +69,7 @@ define(function (require) {
             }
 
             self.perPage = _.parseInt(self.perPage) || $scope[self.perPageProp];
-            if (!self.perPage) {
+            if (self.perPage == null) {
               self.perPage = ALL;
               return;
             }