backport official 'Data Table' last changes

fbaligand · Feb 25, 2018 · d51a9b5 · d51a9b5
1 parent 7c7e362
commit d51a9b5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/public/enhanced-table-vis-controller.js b/public/enhanced-table-vis-controller.js
@@ -206,20 +206,21 @@ module.controller('EnhancedTableVisController', function ($scope, Private, confi
 
   /**
    * Recreate the entire table when:
-   * - the underlying data changes (esResponse)
+   * - table 'renderComplete' event (renderComplete)
    * - user submits a new filter to apply on results (activeFilter)
    */
-  $scope.$watchMulti(['esResponse', 'activeFilter'], function ([resp]) {
+  $scope.$watchMulti(['renderComplete', 'activeFilter'], function () {
 
     let tableGroups = $scope.tableGroups = null;
     let hasSomeRows = $scope.hasSomeRows = null;
+    let esResponse = $scope.esResponse;
 
-    if (resp) {
+    if (esResponse) {
       const vis = $scope.vis;
       const params = vis.params;
 
       // create tableGroups
-      tableGroups = tabifyAggResponse(vis, resp, {
+      tableGroups = tabifyAggResponse(vis, esResponse, {
         partialRows: params.showPartialRows,
         minimalColumns: vis.isHierarchical() && !params.showMeticsAtAllLevels,
         asAggConfigResults: true
@@ -230,7 +231,7 @@ module.controller('EnhancedTableVisController', function ($scope, Private, confi
         if (computedColumn.enabled) {
           let parser = createParser(computedColumn);
           let newColumn = createColumn(computedColumn, index);
-          createTables(tableGroups.tables, computedColumn, index, parser, newColumn, resp.hits.total);
+          createTables(tableGroups.tables, computedColumn, index, parser, newColumn, esResponse.hits.total);
         }
       });
 
@@ -262,13 +263,12 @@ module.controller('EnhancedTableVisController', function ($scope, Private, confi
         'hide-pagination': !showPagination,
         'hide-export-links': params.hideExportLinks
       };
-
-      $scope.renderComplete();
     }
 
     $scope.hasSomeRows = hasSomeRows;
     if (hasSomeRows) {
       $scope.tableGroups = tableGroups;
     }
+    $scope.renderComplete();
   });
 });
diff --git a/public/enhanced-table-vis.html b/public/enhanced-table-vis.html
@@ -25,11 +25,11 @@ <h4>No results found</h4>
   <div ng-if="tableGroups" class="table-vis-container" ng-class="tableVisContainerClass">
     <kbn-agg-table-group
       group="tableGroups"
-      export-title="vis.title"
-      per-page="vis.params.perPage"
+      export-title="visState.title"
+      per-page="visState.params.perPage"
       sort="sort"
-      show-total="vis.params.showTotal"
-      total-func="vis.params.totalFunc">
+      show-total="visState.params.showTotal"
+      total-func="visState.params.totalFunc">
     </kbn-agg-table-group>
   </div>
 </div>
diff --git a/public/enhanced-table-vis.js b/public/enhanced-table-vis.js
@@ -37,8 +37,7 @@ function EnhancedTableVisProvider(Private) {
     image,
     description: 'Same functionality than Data Table, but with enhanced features like computed columns and filter bar.',
     category: CATEGORY.DATA,
-    template: tableVisTemplate,
-    params: {
+    visConfig: {
       defaults: {
         perPage: 10,
         showPartialRows: false,
@@ -56,6 +55,7 @@ function EnhancedTableVisProvider(Private) {
         filterBarHideable: false,
         filterBarWidth: '25%'
       },
+      template: tableVisTemplate
     },
     editorConfig: {
       optionsTemplate: '<enhanced-table-vis-params></enhanced-table-vis-params>',