From 35cf4f6b316204114f94577ce283dcb49769f601 Mon Sep 17 00:00:00 2001 From: Cassandra Targett Date: Fri, 16 Feb 2018 13:55:21 -0600 Subject: [PATCH] SOLR-11897: Add toggle to disable auto-refresh of Logging page in the UI --- solr/CHANGES.txt | 9 +++++++-- solr/webapp/web/css/angular/logging.css | 14 ++++++++++++++ solr/webapp/web/js/angular/controllers/logging.js | 10 +++++++++- solr/webapp/web/partials/logging.html | 1 + 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index ea03776cb2a..1dd6db2675c 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -279,9 +279,11 @@ Other Changes * SOLR-11067: REPLACENODE should identify appropriate nodes if targetNode is not provided (noble) -* SOLR-11848: Update Ref Guide to include info on grouping operations and using curl for large files. (Dariusz Wojtas via Cassandra Targett) +* SOLR-11848: Update Ref Guide to include info on grouping operations and using curl for large files. (Dariusz Wojtas + via Cassandra Targett) -* SOLR-11613: Make message for missing dataimport config in UI more explicit. (Shawn Heisey, Amrit Sarkar via Cassandra Targett) +* SOLR-11613: Make message for missing dataimport config in UI more explicit. (Shawn Heisey, Amrit Sarkar via + Cassandra Targett) * SOLR-11933: Make DIH UI page safer by not default checking the clean checkbox (Eric Pugh via Tomás Fernández Löbbe) @@ -296,6 +298,9 @@ Other Changes * SOLR-6057: Change highlight color in UI Analysis screen (Cassandra Targett) +* SOLR-11897: Add toggle to disable auto-refresh of Logging page in the UI (Tommy Marshment-Howell via + Cassandra Targett) + ================== 7.2.1 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/webapp/web/css/angular/logging.css b/solr/webapp/web/css/angular/logging.css index 67df73aa988..e28e771cfaf 100644 --- a/solr/webapp/web/css/angular/logging.css +++ b/solr/webapp/web/css/angular/logging.css @@ -84,6 +84,20 @@ limitations under the License. color: #333; } +#content #logging #viewer #refresh-toggle { + background-position: 0 50%; + padding-left: 21px; + width:45%; +} + +#content #logging #viewer #refresh-toggle.active { + background-image: url( ../../img/ico/cross-button.png ); +} + +#content #logging #viewer #refresh-toggle.stopped { + background-image: url( ../../img/ico/arrow-circle.png ) ; +} + #content #logging #viewer table { border-collapse: collapse; diff --git a/solr/webapp/web/js/angular/controllers/logging.js b/solr/webapp/web/js/angular/controllers/logging.js index 31747460a57..585c90a21c2 100644 --- a/solr/webapp/web/js/angular/controllers/logging.js +++ b/solr/webapp/web/js/angular/controllers/logging.js @@ -78,7 +78,15 @@ solrAdminApp.controller('LoggingController', }); }; $scope.refresh(); - + $scope.toggleRefresh = function() { + if(!$scope.stopped) { + $scope.stopped = true; + $timeout.cancel($scope.timeout); + } else { + $scope.stopped = false; + $scope.timeout = $timeout($scope.refresh, 10000); + } + }; $scope.toggleTimezone = function() { $scope.timezone = ($scope.timezone=="Local") ? "UTC":"Local"; $cookies.logging_timezone = $scope.timezone; diff --git a/solr/webapp/web/partials/logging.html b/solr/webapp/web/partials/logging.html index 833806a7f34..9952360b302 100644 --- a/solr/webapp/web/partials/logging.html +++ b/solr/webapp/web/partials/logging.html @@ -51,6 +51,7 @@ limitations under the License.