IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adds support to have filters inside filters, (nested templated segments), Closes #128

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-03-18 21:07:52 +01:00 committed by Bruce Sherrod
parent 48d3317136
commit dd18b6c836
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/panels/filtering/module.html
View File

@ -2,7 +2,7 @@
<div class='filtering-container'> <div class='filtering-container'>
<div ng-repeat="filter in filterSrv.list" class="small filter-panel-filter"> <div ng-repeat="filter in filterList" class="small filter-panel-filter">
<div> <div>
<i class="filter-action pointer icon-remove" bs-tooltip="'Remove'" ng-click="remove(filter)"></i> <i class="filter-action pointer icon-remove" bs-tooltip="'Remove'" ng-click="remove(filter)"></i>
<i class="filter-action pointer icon-edit" ng-hide="filter.editing" bs-tooltip="'Edit'" ng-click="filter.editing = true"></i> <i class="filter-action pointer icon-edit" ng-hide="filter.editing" bs-tooltip="'Edit'" ng-click="filter.editing = true"></i>
@ -17,7 +17,7 @@
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li ng-repeat="option in filter.options"> <li ng-repeat="option in filter.options">
<a ng-click="filterSrv.filterOptionSelected(filter, option)">{{option.text}}</a> <a ng-click="filterOptionSelected(filter, option)">{{option.text}}</a>
</li> </li>
</ul> </ul>
</li> </li>
@ -40,9 +40,8 @@
</li> </li>
</ul> </ul>
<div> <div>
<input type="submit" value="Apply" ng-click="applyFilter(filter)" class="filter-apply btn btn-success btn-mini" bs-tooltip="'Save and refresh'"/> <input type="submit" value="Update" ng-click="applyFilter(filter)" class="filter-apply btn btn-success btn-mini" bs-tooltip="'Update and refresh'"/>
<button ng-click="filter.editing=undefined" class="filter-apply btn btn-mini" bs-tooltip="'Save without refresh'">Close</button>
<button ng-click="filter.editing=undefined" class="filter-apply btn btn-mini" bs-tooltip="'Save without refresh'">Save</button>
</div> </div>
</form> </form>
</div> </div>

22
src/app/panels/filtering/module.js
View File

@ -27,15 +27,33 @@ function (angular, app, _) {
_.defaults($scope.panel,_d); _.defaults($scope.panel,_d);
$scope.init = function() { $scope.init = function() {
$scope.filterSrv = filterSrv; $scope.filterList = filterSrv.list;
}; };
$scope.remove = function(filter) { $scope.remove = function(filter) {
filterSrv.remove(filter); filterSrv.remove(filter);
}; };
$scope.filterOptionSelected = function(filter, option) {
filterSrv.filterOptionSelected(filter, option);
$scope.applyFilterToOtherFilters(filter);
};
$scope.applyFilterToOtherFilters = function(updatedFilter) {
_.each($scope.filterList, function(filter) {
if (filter === updatedFilter) {
return;
}
if (filter.query.indexOf(updatedFilter.name) !== -1) {
$scope.applyFilter(filter);
}
});
};
$scope.applyFilter = function(filter) { $scope.applyFilter = function(filter) {
datasourceSrv.default.metricFindQuery(filter.query) var query = filterSrv.applyFilterToTarget(filter.query);
datasourceSrv.default.metricFindQuery(query)
.then(function (results) { .then(function (results) {
filter.editing=undefined; filter.editing=undefined;
filter.options = _.map(results, function(node) { filter.options = _.map(results, function(node) {

2
src/app/services/all.js
View File

@ -1,10 +1,10 @@
define([ define([
'./alertSrv', './alertSrv',
'./dashboard', './dashboard',
'./datasourceSrv',
'./filterSrv', './filterSrv',
'./timer', './timer',
'./panelMove', './panelMove',
'./datasourceSrv',
'./keyboardManager', './keyboardManager',
'./annotationsSrv', './annotationsSrv',
'./playlistSrv', './playlistSrv',