Skip to content

In filter #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mznet wants to merge 5 commits into
base: master
Choose a base branch
from
Open

In filter #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f104d6
added druid in filter
mjet-plane Aug 1, 2018
1e47b3c
use lodash chaining filter
mjet-plane Aug 1, 2018
877a0f7
value method is needed to retrieve underscore chaining result
mjet-plane Aug 2, 2018
9cb92e4
templateSrv.replace doesn't csv foramt in 4.x
mjet-plane Aug 2, 2018
b10be7c
dist file commit was omitted
mjet-plane Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions dist/datasource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,18 @@ function (angular, _, dateMath, moment) {
this.periodGranularity = instanceSettings.jsonData.periodGranularity;

function replaceTemplateValues(obj, attrList) {
var substitutedVals = attrList.map(function (attr) {
return templateSrv.replace(obj[attr]);
});
if (obj.type === 'in') {
var substitutedVals = _.chain(attrList)
.map(attr => { return templateSrv.replace(obj[attr]).replace(/[{}]/g, "") })
.map(val => { return val.split(',') })
.value().flatten();
substitutedVals = [substitutedVals];
} else {
var substitutedVals = attrList.map(function (attr) {
return templateSrv.replace(obj[attr]);
});
}

return _.assign(_.clone(obj, true), _.zipObject(attrList, substitutedVals));
}

Expand All @@ -57,6 +66,7 @@ function (angular, _, dateMath, moment) {
"regex": _.partialRight(replaceTemplateValues, ['pattern']),
"javascript": _.partialRight(replaceTemplateValues, ['function']),
"search": _.partialRight(replaceTemplateValues, []),
"in": _.partialRight(replaceTemplateValues, ['values'])
};

this.testDatasource = function() {
Expand Down
13 changes: 13 additions & 0 deletions dist/partials/query.editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,15 @@
<i class="fa fa-remove"></i>
</a>
</label>
<label ng-switch-when="in" class="gf-form-label">
{{filter.type}}:&nbsp;{{filter.dimension}}&nbsp;=&nbsp;{{filter.values}}
<a ng-click="ctrl.editFilter($index)">
<i class="fa fa-pencil"></i>
</a>
<a ng-click="ctrl.removeFilter($index)">
<i class="fa fa-remove"></i>
</a>
</label>
<label class="gf-form-label" ng-if="filter.negate">&nbsp;)</label>
</div>

Expand Down Expand Up @@ -243,6 +252,10 @@
<input type="text" ng-switch-when="javascript" class="input-small gf-form-input width-10" spellcheck='false' ng-model="ctrl.target.currentFilter.dimension" placeholder="dimension" bs-typeahead="ctrl.getDimensions" data-min-length=0 ng-blur="ctrl.targetBlur()">
<input type="text" ng-switch-when="javascript" class="input-small gf-form-input width-10" spellcheck='false' ng-model="ctrl.target.currentFilter.function" placeholder="func" ng-blur="ctrl.targetBlur()" placeholder="value">
</div>
<div class="gf-form" ng-show="ctrl.addFilterMode" ng-switch on="ctrl.target.currentFilter.type">
<input type="text" ng-switch-when="in" class="input-small gf-form-input width-10" spellcheck='false' ng-model="ctrl.target.currentFilter.dimension" placeholder="dimension" bs-typeahead="ctrl.getDimensions" data-min-length=0 ng-blur="ctrl.targetBlur()">
<input type="text" ng-switch-when="in" class="input-small gf-form-input width-10" spellcheck='false' ng-model="ctrl.target.currentFilter.values" placeholder="values" ng-blur="ctrl.targetBlur()" placeholder="values">
</div>
<gf-form-switch ng-show="ctrl.addFilterMode" ng-switch on="ctrl.target.currentFilter.type" class="gf-form" label="Negate" label-class="query-keyword" checked="ctrl.target.currentFilter.negate">
</gf-form-switch>
<div class="gf-form" ng-show="ctrl.addFilterMode">
Expand Down
2 changes: 2 additions & 0 deletions dist/query_ctrl.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export declare class DruidQueryCtrl extends QueryCtrl {
"selector": any;
"regex": any;
"javascript": any;
"in": any;
};
aggregatorValidators: {
"count": (target: any) => string;
Expand Down Expand Up @@ -101,6 +102,7 @@ export declare class DruidQueryCtrl extends QueryCtrl {
validateSelectorFilter(target: any): string;
validateJavascriptFilter(target: any): string;
validateRegexFilter(target: any): string;
validateInFilter(target: any): string;
validateCountAggregator(target: any): string;
validateCardinalityAggregator(type: any, target: any): string;
validateSimpleAggregator(type: any, target: any): string;
Expand Down
12 changes: 11 additions & 1 deletion dist/query_ctrl.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/query_ctrl.js.map
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion dist/query_ctrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ export class DruidQueryCtrl extends QueryCtrl {
filterValidators = {
"selector": this.validateSelectorFilter.bind(this),
"regex": this.validateRegexFilter.bind(this),
"javascript": this.validateJavascriptFilter.bind(this)
"javascript": this.validateJavascriptFilter.bind(this),
"in": this.validateInFilter.bind(this)
};
aggregatorValidators = {
"count": this.validateCountAggregator,
Expand Down Expand Up @@ -458,6 +459,18 @@ export class DruidQueryCtrl extends QueryCtrl {
return null;
}

validateInFilter(target) {
if (!target.currentFilter.dimension) {
return "Must provide dimension name for in filter.";
}

if (!target.currentFilter.values) {
return "Must provide values for in filter"
}

return null;
}

validateCountAggregator(target) {
if (!target.currentAggregator.name) {
return "Must provide an output name for count aggregator.";
Expand Down
2 changes: 2 additions & 0 deletions dist/test/query_ctrl.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export declare class DruidQueryCtrl extends QueryCtrl {
"selector": any;
"regex": any;
"javascript": any;
"in": any;
};
aggregatorValidators: {
"count": (target: any) => string;
Expand Down Expand Up @@ -101,6 +102,7 @@ export declare class DruidQueryCtrl extends QueryCtrl {
validateSelectorFilter(target: any): string;
validateJavascriptFilter(target: any): string;
validateRegexFilter(target: any): string;
validateInFilter(target: any): string;
validateCountAggregator(target: any): string;
validateCardinalityAggregator(type: any, target: any): string;
validateSimpleAggregator(type: any, target: any): string;
Expand Down
12 changes: 11 additions & 1 deletion dist/test/query_ctrl.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/test/query_ctrl.js.map
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 13 additions & 3 deletions src/datasource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,18 @@ function (angular, _, dateMath, moment) {
this.periodGranularity = instanceSettings.jsonData.periodGranularity;

function replaceTemplateValues(obj, attrList) {
var substitutedVals = attrList.map(function (attr) {
return templateSrv.replace(obj[attr]);
});
if (obj.type === 'in') {
var substitutedVals = _.chain(attrList)
.map(attr => { return templateSrv.replace(obj[attr]).replace(/[{}]/g, "") })
.map(val => { return val.split(',') })
.value().flatten();
substitutedVals = [substitutedVals];
} else {
var substitutedVals = attrList.map(function (attr) {
return templateSrv.replace(obj[attr]);
});
}

return _.assign(_.clone(obj, true), _.zipObject(attrList, substitutedVals));
}

Expand All @@ -57,6 +66,7 @@ function (angular, _, dateMath, moment) {
"regex": _.partialRight(replaceTemplateValues, ['pattern']),
"javascript": _.partialRight(replaceTemplateValues, ['function']),
"search": _.partialRight(replaceTemplateValues, []),
"in": _.partialRight(replaceTemplateValues, ['values'])
};

this.testDatasource = function() {
Expand Down
13 changes: 13 additions & 0 deletions src/partials/query.editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,15 @@
<i class="fa fa-remove"></i>
</a>
</label>
<label ng-switch-when="in" class="gf-form-label">
{{filter.type}}:&nbsp;{{filter.dimension}}&nbsp;=&nbsp;{{filter.values}}
<a ng-click="ctrl.editFilter($index)">
<i class="fa fa-pencil"></i>
</a>
<a ng-click="ctrl.removeFilter($index)">
<i class="fa fa-remove"></i>
</a>
</label>
<label class="gf-form-label" ng-if="filter.negate">&nbsp;)</label>
</div>

Expand Down Expand Up @@ -243,6 +252,10 @@
<input type="text" ng-switch-when="javascript" class="input-small gf-form-input width-10" spellcheck='false' ng-model="ctrl.target.currentFilter.dimension" placeholder="dimension" bs-typeahead="ctrl.getDimensions" data-min-length=0 ng-blur="ctrl.targetBlur()">
<input type="text" ng-switch-when="javascript" class="input-small gf-form-input width-10" spellcheck='false' ng-model="ctrl.target.currentFilter.function" placeholder="func" ng-blur="ctrl.targetBlur()" placeholder="value">
</div>
<div class="gf-form" ng-show="ctrl.addFilterMode" ng-switch on="ctrl.target.currentFilter.type">
<input type="text" ng-switch-when="in" class="input-small gf-form-input width-10" spellcheck='false' ng-model="ctrl.target.currentFilter.dimension" placeholder="dimension" bs-typeahead="ctrl.getDimensions" data-min-length=0 ng-blur="ctrl.targetBlur()">
<input type="text" ng-switch-when="in" class="input-small gf-form-input width-10" spellcheck='false' ng-model="ctrl.target.currentFilter.values" placeholder="values" ng-blur="ctrl.targetBlur()" placeholder="values">
</div>
<gf-form-switch ng-show="ctrl.addFilterMode" ng-switch on="ctrl.target.currentFilter.type" class="gf-form" label="Negate" label-class="query-keyword" checked="ctrl.target.currentFilter.negate">
</gf-form-switch>
<div class="gf-form" ng-show="ctrl.addFilterMode">
Expand Down
15 changes: 14 additions & 1 deletion src/query_ctrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ export class DruidQueryCtrl extends QueryCtrl {
filterValidators = {
"selector": this.validateSelectorFilter.bind(this),
"regex": this.validateRegexFilter.bind(this),
"javascript": this.validateJavascriptFilter.bind(this)
"javascript": this.validateJavascriptFilter.bind(this),
"in": this.validateInFilter.bind(this)
};
aggregatorValidators = {
"count": this.validateCountAggregator,
Expand Down Expand Up @@ -458,6 +459,18 @@ export class DruidQueryCtrl extends QueryCtrl {
return null;
}

validateInFilter(target) {
if (!target.currentFilter.dimension) {
return "Must provide dimension name for in filter.";
}

if (!target.currentFilter.values) {
return "Must provide values for in filter"
}

return null;
}

validateCountAggregator(target) {
if (!target.currentAggregator.name) {
return "Must provide an output name for count aggregator.";
Expand Down