Skip to content

Allows to do 'eui-filter-self'='false' with nested aggregations #38

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allows to do 'eui-filter-self'='false' with nested aggregations #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 23 additions & 13 deletions dist/elasticui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,17 @@ var elasticui;
}
var facetFilters = filters;
if (!filterSelf) {
facetFilters = facetFilters.filter(function (val) { return val != _this.scope.combinedFilter && (typeof val.field === "undefined" || val.field() != ejsAggregation.field()); });
var aggfield;
if (typeof ejsAggregation.field === "undefined") {
var first;
for (first in ejsAggregation.toJSON())
break;
aggfield = ejsAggregation.agg()[first]["terms"]["field"];
}
else {
aggfield = ejsAggregation.field();
}
facetFilters = facetFilters.filter(function (val) { return val != _this.scope.combinedFilter && (typeof val.field === "undefined" || val.field() != aggfield); });
}
var combinedFilters = elasticui.util.FilterTool.combineFilters(facetFilters);
if (combinedFilters != null) {
Expand Down Expand Up @@ -902,10 +912,10 @@ var elasticui;
var directive = {};
directive.restrict = 'E';
directive.scope = true;
directive.template = '\
<ul class="pager">\
<li ng-class="{disabled:indexVM.page <= 1}"><a href="" ng-click="indexVM.page=indexVM.page - 1">Previous</a></li>\
<li ng-class="{disabled:indexVM.pageCount <= indexVM.page}"><a href="" ng-click="indexVM.page=indexVM.page + 1">Next</a></li>\
directive.template = '\
<ul class="pager">\
<li ng-class="{disabled:indexVM.page <= 1}"><a href="" ng-click="indexVM.page=indexVM.page - 1">Previous</a></li>\
<li ng-class="{disabled:indexVM.pageCount <= indexVM.page}"><a href="" ng-click="indexVM.page=indexVM.page + 1">Next</a></li>\
</ul>';
return directive;
}
Expand Down Expand Up @@ -935,14 +945,14 @@ var elasticui;
scope.agg_name = scope.field.replace(/[^a-z_0-9]/gmi, "_") + "_" + (directives.default_agg_count++);
}
};
directive.template = '\
<ul class="nav nav-list" eui-aggregation="ejs.TermsAggregation(agg_name).field(field).size(size)">\
<li ng-repeat="bucket in aggResult.buckets">\
<label eui-filter="ejs.TermsFilter(field, bucket.key)">\
<span ng-if="!filter.enabled"><a href="" ng-click="filter.enabled=true">{{bucket.key}} <span class="muted">({{bucket.doc_count}})</span></a></span>\
<span ng-if="filter.enabled">{{bucket.key}} <a href="" ng-click="filter.enabled=false" class="facet-remove">x</a></span>\
</label>\
</li>\
directive.template = '\
<ul class="nav nav-list" eui-aggregation="ejs.TermsAggregation(agg_name).field(field).size(size)">\
<li ng-repeat="bucket in aggResult.buckets">\
<label eui-filter="ejs.TermsFilter(field, bucket.key)">\
<span ng-if="!filter.enabled"><a href="" ng-click="filter.enabled=true">{{bucket.key}} <span class="muted">({{bucket.doc_count}})</span></a></span>\
<span ng-if="filter.enabled">{{bucket.key}} <a href="" ng-click="filter.enabled=false" class="facet-remove">x</a></span>\
</label>\
</li>\
</ul>';
return directive;
}
Expand Down
Loading