Commit 76267754 by Marcus Efraimsson Committed by GitHub

Merge pull request #11695 from grafana/11508_variables_preview_values

allow to show more preview values for variables
parents d36efddc a4031402
......@@ -10,6 +10,7 @@ export class VariableEditorCtrl {
$scope.ctrl = {};
$scope.namePattern = /^(?!__).*$/;
$scope._ = _;
$scope.optionsLimit = 20;
$scope.refreshOptions = [
{ value: 0, text: 'Never' },
......@@ -96,6 +97,7 @@ export class VariableEditorCtrl {
};
$scope.runQuery = function() {
$scope.optionsLimit = 20;
return variableSrv.updateOptions($scope.current).catch(err => {
if (err.data && err.data.message) {
err.message = err.data.message;
......@@ -165,6 +167,10 @@ export class VariableEditorCtrl {
$scope.removeVariable = function(variable) {
variableSrv.removeVariable(variable);
};
$scope.showMoreOptions = function() {
$scope.optionsLimit += 20;
};
}
}
......
......@@ -280,11 +280,14 @@
</div>
<div class="gf-form-group" ng-show="current.options.length">
<h5>Preview of values (shows max 20)</h5>
<h5>Preview of values</h5>
<div class="gf-form-inline">
<div class="gf-form" ng-repeat="option in current.options | limitTo: 20">
<span class="gf-form-label">{{option.text}}</span>
</div>
<div class="gf-form" ng-repeat="option in current.options | limitTo: optionsLimit">
<span class="gf-form-label">{{option.text}}</span>
</div>
<div class="gf-form" ng-if= "current.options.length > optionsLimit">
<a class="gf-form-label btn-secondary" ng-click="showMoreOptions()">Show more</a>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment