From 7e8d7c92ade0503243ec2d36d7323c7b08af0229 Mon Sep 17 00:00:00 2001 From: Elastic Jasper Date: Wed, 23 Nov 2016 17:04:19 -0500 Subject: [PATCH] `render-counter` directive Backports PR #9206 **Commit 1:** [docTable/row] delay first render until watchers initialize * Original sha: 4945e088c135f4d5f36c971d442f39a764b0c32c * Authored by spalger on 2016-11-23T18:57:22Z **Commit 2:** [docTable/row] emit a renderComplete event, count in table directive * Original sha: 641f9af0e342f4c40b5ab9f46ae11182ff7b70d4 * Authored by spalger on 2016-11-23T18:58:21Z **Commit 3:** [renderCounter] unify render counting login into directive * Original sha: 0c084acc9715ec6712922727476c4f369a1ab0c7 * Authored by spalger on 2016-11-23T21:26:44Z **Commit 4:** [docTable] remove unused var * Original sha: 275bf70a955f76d4ca5642cdd93f84f2ec9eacbb * Authored by spalger on 2016-11-23T22:00:52Z --- .../dashboard/components/panel/panel.html | 5 ++- .../kibana/public/discover/index.html | 3 +- .../public/visualize/editor/editor.html | 1 + src/ui/public/directives/render_counter.js | 31 +++++++++++++++++++ .../public/doc_table/components/table_row.js | 17 ++++------ src/ui/public/doc_table/doc_table.html | 2 +- src/ui/public/visualize/visualize.js | 13 +++----- 7 files changed, 49 insertions(+), 23 deletions(-) create mode 100644 src/ui/public/directives/render_counter.js diff --git a/src/core_plugins/kibana/public/dashboard/components/panel/panel.html b/src/core_plugins/kibana/public/dashboard/components/panel/panel.html index 6665034471980..874a62b75522a 100644 --- a/src/core_plugins/kibana/public/dashboard/components/panel/panel.html +++ b/src/core_plugins/kibana/public/dashboard/components/panel/panel.html @@ -28,13 +28,16 @@ search-source="savedObj.searchSource" show-spy-panel="chrome.getVisible()" ui-state="uiState" + render-counter class="panel-content"> - diff --git a/src/core_plugins/kibana/public/discover/index.html b/src/core_plugins/kibana/public/discover/index.html index 1a60d56b6b641..0f2faa466bc67 100644 --- a/src/core_plugins/kibana/public/discover/index.html +++ b/src/core_plugins/kibana/public/discover/index.html @@ -125,7 +125,8 @@

Searching

sorting="state.sort" columns="state.columns" infinite-scroll="true" - filter="filterQuery"> + filter="filterQuery" + render-counter>
diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.html b/src/core_plugins/kibana/public/visualize/editor/editor.html index f0547cbe8e87a..44d62bb5a3fc2 100644 --- a/src/core_plugins/kibana/public/visualize/editor/editor.html +++ b/src/core_plugins/kibana/public/visualize/editor/editor.html @@ -80,6 +80,7 @@
({ + controller($scope, $element) { + let counter = 0; + + const increment = () => { + counter += 1; + $element.attr('render-counter', counter); + }; + + const teardown = () => { + $element.off('renderComplete', increment); + }; + + const setup = () => { + $element.attr('render-counter', counter); + $element.on('renderComplete', increment); + $scope.$on('$destroy', teardown); + }; + + this.disable = () => { + $element.attr('render-counter', 'disabled'); + teardown(); + }; + + setup(); + } + })); diff --git a/src/ui/public/doc_table/components/table_row.js b/src/ui/public/doc_table/components/table_row.js index 530ddb996c3a9..c8cab43acb329 100644 --- a/src/ui/public/doc_table/components/table_row.js +++ b/src/ui/public/doc_table/components/table_row.js @@ -40,10 +40,6 @@ module.directive('kbnTableRow', function ($compile) { $el.after(''); $el.empty(); - let init = function () { - createSummaryRow($scope.row, $scope.row._id); - }; - // when we compile the details, we use this $scope let $detailsScope; @@ -79,11 +75,11 @@ module.directive('kbnTableRow', function ($compile) { $compile($detailsTr)($detailsScope); }; - $scope.$watchCollection('columns', function () { - createSummaryRow($scope.row, $scope.row._id); - }); - - $scope.$watchMulti(['indexPattern.timeFieldName', 'row.highlight'], function () { + $scope.$watchMulti([ + 'indexPattern.timeFieldName', + 'row.highlight', + '[]columns' + ], function () { createSummaryRow($scope.row, $scope.row._id); }); @@ -144,6 +140,7 @@ module.directive('kbnTableRow', function ($compile) { // trim off cells that were not used rest of the cells $cells.filter(':gt(' + (newHtmls.length - 1) + ')').remove(); + $el.trigger('renderComplete'); } /** @@ -161,8 +158,6 @@ module.directive('kbnTableRow', function ($compile) { return text; } - - init(); } }; }); diff --git a/src/ui/public/doc_table/doc_table.html b/src/ui/public/doc_table/doc_table.html index 68cd1e0c3d4f2..1f7f0c0c90ce0 100644 --- a/src/ui/public/doc_table/doc_table.html +++ b/src/ui/public/doc_table/doc_table.html @@ -43,4 +43,4 @@

No results found

-
\ No newline at end of file +
diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js index 29234e2b46cbf..39e9885bc5eb7 100644 --- a/src/ui/public/visualize/visualize.js +++ b/src/ui/public/visualize/visualize.js @@ -25,6 +25,7 @@ uiModules return { restrict: 'E', + require: '?renderCounter', scope : { showSpyPanel: '=?', vis: '=', @@ -34,7 +35,7 @@ uiModules esResp: '=?', }, template: visualizeTemplate, - link: function ($scope, $el, attr) { + link: function ($scope, $el, attr, renderCounter) { const minVisChartHeight = 180; if (_.isUndefined($scope.showSpyPanel)) { @@ -72,14 +73,8 @@ uiModules return legendPositionToVisContainerClassMap[$scope.vis.params.legendPosition]; }; - if ($scope.vis.implementsRenderComplete()) { - $el.attr('has-render-count', 'true'); - let renderCount = 0; - $el.on('renderComplete', () => { - $el.attr('render-count', ++renderCount); - }); - } else { - $el.attr('has-render-count', 'false'); + if (renderCounter && !$scope.vis.implementsRenderComplete()) { + renderCounter.disable(); } $scope.spy = {};