Skip to content

Commit a6dea77

Browse files
authored
Merge pull request #1053 from adlius/fix-sorting
[No ticket] Fix sorting
2 parents c3b954e + 38aaa62 commit a6dea77

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

lib/registries/addon/discover/controller.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ const sortOptions = [
5858
new SearchOrder({
5959
ascending: true,
6060
display: 'registries.discover.order.modified_ascending',
61-
key: 'date_updated',
61+
key: 'date',
6262
}),
6363
new SearchOrder({
6464
ascending: false,
6565
display: 'registries.discover.order.modified_descending',
66-
key: 'date_updated',
66+
key: 'date',
6767
}),
6868
];
6969

lib/registries/addon/index/controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default class Index extends Controller {
2424
getRecentRegistrations = task(function *(this: Index) {
2525
const [recentResults, totalResults]: Array<SearchResults<ShareRegistration>> = yield RSVP.all([
2626
this.shareSearch.registrations(new SearchOptions({
27-
order: new SearchOrder({ display: '', ascending: false, key: 'date_updated' }),
27+
order: new SearchOrder({ display: '', ascending: false, key: 'date' }),
2828
query: config.indexPageRegistrationsQuery,
2929
size: 5,
3030
})),

tests/engines/registries/integration/discover/discover-test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,24 @@ const QueryParamTestCases: Array<{
7777
},
7878
}, {
7979
name: 'Sort',
80-
params: { sort: 'date_updated' },
80+
params: { sort: 'date' },
8181
expected: {
8282
query: '',
8383
order: new SearchOrder({
8484
ascending: true,
8585
display: 'registries.discover.order.modified_ascending',
86-
key: 'date_updated',
86+
key: 'date',
8787
}),
8888
},
8989
}, {
9090
name: 'Sort decending',
91-
params: { sort: '-date_updated' },
91+
params: { sort: '-date' },
9292
expected: {
9393
query: '',
9494
order: new SearchOrder({
9595
ascending: false,
9696
display: 'registries.discover.order.modified_descending',
97-
key: 'date_updated',
97+
key: 'date',
9898
}),
9999
},
100100
}, {
@@ -252,7 +252,7 @@ module('Registries | Integration | discover', hooks => {
252252
order: new SearchOrder({
253253
ascending: true,
254254
display: 'registries.discover.order.modified_ascending',
255-
key: 'date_updated',
255+
key: 'date',
256256
}),
257257
}));
258258
});

0 commit comments

Comments
 (0)