Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

feat(filter): orderBy for object collections #6337

Closed
wants to merge 1 commit into from
+18 −3
Closed

feat(filter): orderBy for object collections #6337

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
16 changes: 13 additions & 3 deletions src/ng/filter/orderBy.js
View file
Original file line number Diff line number Diff line change
@@ -62,9 +62,19 @@
*/
orderByFilter.$inject = ['$parse'];
function orderByFilter($parse){
return function(array, sortPredicate, reverseOrder) {
if (!isArray(array)) return array;
if (!sortPredicate) return array;
return function(sortable, sortPredicate, reverseOrder) {
if (!isArray(sortable) && !isObject(sortable)) return sortable;
if (!sortPredicate) return sortable;
var array = sortable;
if(isObject(sortable)) {
array = [];
for (var key in sortable) {
if (sortable.hasOwnProperty(key) && key.charAt(0) != '$') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really like that we're losing object keys with this, I dunno. It basically transforms the object into an array, and it's impossible to sort by the key of the object (which would be a cool trick, even for arrays)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but hmm, maybe it doesn't matter that much.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand your point about that but to keep the key, we would have to return a different structure like [{key: 'userName', value: {/* an object*/}}, ...] which is an even worse solution I believe. If the keys are important though, and maybe even sorting the keys, I think the best way is to first create an array of the keys then iterate on the keys.

array.push(sortable[key]);
}
}
}

sortPredicate = isArray(sortPredicate) ? sortPredicate: [sortPredicate];
sortPredicate = map(sortPredicate, function(predicate){
var descending = false, get = predicate || identity;
5 changes: 5 additions & 0 deletions test/ng/filter/orderBySpec.js
View file
Original file line number Diff line number Diff line change
@@ -31,4 +31,9 @@ describe('Filter: orderBy', function() {
toEqual([{a:2, b:1},{a:15, b:1}]);
});

it('can sort a hash collection', function() {
expect(orderBy({c: {name: 'c'}, a: {name: 'a'}, b: {name: 'b'}}, 'name')).toEqualData([{name: 'a'}, {name: 'b'}, {name: 'c'}]);
expect(orderBy({c: {name: 'c'}, a: {name: 'a'}, b: {name: 'b'}}, '-name')).toEqualData([{name: 'c'}, {name: 'b'}, {name: 'a'}]);
});

});