Skip to content

Check filter selected and show selected items on top #40

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

Merged
cigolpl merged 3 commits into from
Aug 14, 2019
Merged

Check filter selected and show selected items on top #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c82bbf
Check if filter is selected and let orderBy first show selected items…
Bartel-C8 Aug 14, 2019
36dcb6e
Remove debug code.
Bartel-C8 Aug 14, 2019
b25942f
Include review comments.
Bartel-C8 Aug 14, 2019
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
Prev Previous commit
Include review comments.
  • Loading branch information
@Bartel-C8
Bartel-C8 committed Aug 14, 2019
commit b25942f86a88c986ef0e1d0af67773e20226be33
2 changes: 1 addition & 1 deletion src/lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ module.exports.buckets = function(items, field, agg, aggregations) {
return {
key: key,
doc_count: val,
selected: helpers.includes_any_element(key, agg.filters)
selected: _.includes(key, agg.filters)
};
});

Expand Down
140 changes: 3 additions & 137 deletions tests/aggregationsSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,142 +22,6 @@ describe('aggregations', function() {
actors: ['e']
}]

var moreItems = [{
name: 'movie1',
tags: ['a', 'b', 'c', 'd'],
actors: ['a', 'b', 'm']
}, {
"tags": [
"social decay",
"well",
"deception",
"falling down a well",
"falling into a well"
],
"actors": [
"Christian Bale",
"Michael Caine",
"Liam Neeson",
"Katie Holmes",
"Gary Oldman",
"Cillian Murphy",
"Tom Wilkinson",
"Rutger Hauer",
"Ken Watanabe",
"Mark Boone Junior",
"Linus Roache",
"Morgan Freeman",
"Larry Holden",
"Gerard Murphy",
"Colin McFarlane"
],
"name": "Batman Begins",
}, {
name: 'The Dark Knight',
"tags": [
"dc comics",
"moral dilemma",
"psychopath",
"false confession",
"star died before release"
],
actors: [
"Christian Bale",
"Michael Caine",
"Liam Neeson",
"Katie Holmes",
"Gary Oldman",
"Cillian Murphy",
"Tom Wilkinson",
"Rutger Hauer",
"Ken Watanabe",
"Mark Boone Junior",
"Linus Roache",
"Morgan Freeman",
"Larry Holden",
"Gerard Murphy",
"Colin McFarlane"
]
}, {
name: 'The Shawshank Redemption',
tags: [
"prison",
"wrongful imprisonment",
"escape from prison",
"prison cell search",
"first person narration"
],
actors: [
"Tim Robbins",
"Morgan Freeman",
"Bob Gunton",
"William Sadler",
"Clancy Brown",
"Gil Bellows",
"Mark Rolston",
"James Whitmore",
"Jeffrey DeMunn",
"Larry Brandenburg",
"Neil Giuntoli",
"Brian Libby",
"David Proval",
"Joseph Ragno",
"Jude Ciccolella"
]
}, {
"name": "Se7en",
"tags": [
"detective",
"serial killer",
"seven deadly sins",
"police partner",
"human monster"
],
"actors": [
"Morgan Freeman",
"Andrew Kevin Walker",
"Kevin Spacey",
"Daniel Zacapa",
"Brad Pitt",
"Gwyneth Paltrow",
"John Cassini",
"Bob Mack",
"Peter Crombie",
"Reg E. Cathey",
"R. Lee Ermey",
"George Christy",
"Endre Hules",
"Hawthorne James",
"William Davidson"
],
}, {
"tags": [
"female villain",
"mysterious woman",
"suspense",
"written by director",
"woman fights a man"
],
"actors": [
"Christian Bale",
"Gary Oldman",
"Tom Hardy",
"Joseph Gordon-Levitt",
"Anne Hathaway",
"Marion Cotillard",
"Morgan Freeman",
"Michael Caine",
"Matthew Modine",
"Alon Aboutboul",
"Ben Mendelsohn",
"Burn Gorman",
"Daniel Sunjata",
"Aidan Gillen",
"Sam Kennard"
],
"name": "The Dark Knight Rises",
}]

it('returns buckets for two fields (tags, actors)', function test(done) {
var result = service.aggregations(items, {
tags: {
Expand Down Expand Up @@ -414,7 +278,9 @@ describe('aggregations', function() {
});

it('returns aggregations with multi array filtering, selected on top', function test(done) {
var result = service.aggregations(moreItems, {
var movies = require('./fixtures/movies_agg_selected.json')

var result = service.aggregations(movies, {
actors: {
filters: ['Morgan Freeman']
},
Expand Down
142 changes: 142 additions & 0 deletions tests/fixtures/movies_agg_selected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
[
{
"name": "movie1",
"tags": ["a", "b", "c", "d"],
"actors": ["a", "b", "m"]
},
{
"tags": [
"social decay",
"well",
"deception",
"falling down a well",
"falling into a well"
],
"actors": [
"Christian Bale",
"Michael Caine",
"Liam Neeson",
"Katie Holmes",
"Gary Oldman",
"Cillian Murphy",
"Tom Wilkinson",
"Rutger Hauer",
"Ken Watanabe",
"Mark Boone Junior",
"Linus Roache",
"Morgan Freeman",
"Larry Holden",
"Gerard Murphy",
"Colin McFarlane"
],
"name": "Batman Begins"
},
{
"name": "The Dark Knight",
"tags": [
"dc comics",
"moral dilemma",
"psychopath",
"false confession",
"star died before release"
],
"actors": [
"Christian Bale",
"Michael Caine",
"Liam Neeson",
"Katie Holmes",
"Gary Oldman",
"Cillian Murphy",
"Tom Wilkinson",
"Rutger Hauer",
"Ken Watanabe",
"Mark Boone Junior",
"Linus Roache",
"Morgan Freeman",
"Larry Holden",
"Gerard Murphy",
"Colin McFarlane"
]
},
{
"name": "The Shawshank Redemption",
"tags": [
"prison",
"wrongful imprisonment",
"escape from prison",
"prison cell search",
"first person narration"
],
"actors": [
"Tim Robbins",
"Morgan Freeman",
"Bob Gunton",
"William Sadler",
"Clancy Brown",
"Gil Bellows",
"Mark Rolston",
"James Whitmore",
"Jeffrey DeMunn",
"Larry Brandenburg",
"Neil Giuntoli",
"Brian Libby",
"David Proval",
"Joseph Ragno",
"Jude Ciccolella"
]
},
{
"name": "Se7en",
"tags": [
"detective",
"serial killer",
"seven deadly sins",
"police partner",
"human monster"
],
"actors": [
"Morgan Freeman",
"Andrew Kevin Walker",
"Kevin Spacey",
"Daniel Zacapa",
"Brad Pitt",
"Gwyneth Paltrow",
"John Cassini",
"Bob Mack",
"Peter Crombie",
"Reg E. Cathey",
"R. Lee Ermey",
"George Christy",
"Endre Hules",
"Hawthorne James",
"William Davidson"
]
},
{
"tags": [
"female villain",
"mysterious woman",
"suspense",
"written by director",
"woman fights a man"
],
"actors": [
"Christian Bale",
"Gary Oldman",
"Tom Hardy",
"Joseph Gordon-Levitt",
"Anne Hathaway",
"Marion Cotillard",
"Morgan Freeman",
"Michael Caine",
"Matthew Modine",
"Alon Aboutboul",
"Ben Mendelsohn",
"Burn Gorman",
"Daniel Sunjata",
"Aidan Gillen",
"Sam Kennard"
],
"name": "The Dark Knight Rises"
}
]