Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 raucao
|
39dca446ac
|
||
|
raucao
|
2e6827f0d0
|
||
|
raucao
|
8c3a805684
|
@@ -4,6 +4,16 @@ import { action } from '@ember/object';
|
|||||||
import { tracked } from '@glimmer/tracking';
|
import { tracked } from '@glimmer/tracking';
|
||||||
import { task } from 'ember-concurrency';
|
import { task } from 'ember-concurrency';
|
||||||
|
|
||||||
|
function getPlaceTime(place) {
|
||||||
|
const dateVal = place.createdAt;
|
||||||
|
if (!dateVal) return 0;
|
||||||
|
if (typeof dateVal === 'number') {
|
||||||
|
return dateVal;
|
||||||
|
}
|
||||||
|
const parsed = Date.parse(dateVal);
|
||||||
|
return isNaN(parsed) ? 0 : parsed;
|
||||||
|
}
|
||||||
|
|
||||||
export default class ListsListController extends Controller {
|
export default class ListsListController extends Controller {
|
||||||
@service router;
|
@service router;
|
||||||
@service mapUi;
|
@service mapUi;
|
||||||
@@ -73,7 +83,7 @@ export default class ListsListController extends Controller {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return merged;
|
return merged.sort((a, b) => getPlaceTime(b) - getPlaceTime(a));
|
||||||
}
|
}
|
||||||
|
|
||||||
@action
|
@action
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "marco",
|
"name": "marco",
|
||||||
"version": "1.25.0",
|
"version": "1.25.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "Unhosted maps app",
|
"description": "Unhosted maps app",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1
@@ -39,7 +39,7 @@
|
|||||||
<meta name="msapplication-TileColor" content="#F6E9A6">
|
<meta name="msapplication-TileColor" content="#F6E9A6">
|
||||||
<meta name="msapplication-TileImage" content="/icons/icon-144.png">
|
<meta name="msapplication-TileImage" content="/icons/icon-144.png">
|
||||||
|
|
||||||
<script type="module" crossorigin src="/assets/main-BVNM87jL.js"></script>
|
<script type="module" crossorigin src="/assets/main-DNM-h3Gw.js"></script>
|
||||||
<link rel="stylesheet" crossorigin href="/assets/main-BGF-Udec.css">
|
<link rel="stylesheet" crossorigin href="/assets/main-BGF-Udec.css">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -135,4 +135,85 @@ module('Acceptance | collections navigation', function (hooks) {
|
|||||||
'Returns gracefully back to lists/to-go list view'
|
'Returns gracefully back to lists/to-go list view'
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('places inside a collection are sorted by createdAt descending', async function (assert) {
|
||||||
|
class SortedMockStorageService extends Service {
|
||||||
|
initialSyncDone = true;
|
||||||
|
savedPlaces = [
|
||||||
|
{
|
||||||
|
id: 'place-oldest',
|
||||||
|
title: 'Oldest Place',
|
||||||
|
geohash: 'u33dc0',
|
||||||
|
createdAt: '2023-01-01T12:00:00.000Z',
|
||||||
|
osmTags: { name: 'Oldest Place' },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'place-newest',
|
||||||
|
title: 'Newest Place',
|
||||||
|
geohash: 'u33dc0',
|
||||||
|
createdAt: '2023-01-03T12:00:00.000Z',
|
||||||
|
osmTags: { name: 'Newest Place' },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'place-middle',
|
||||||
|
title: 'Middle Place',
|
||||||
|
geohash: 'u33dc0',
|
||||||
|
createdAt: '2023-01-02T12:00:00.000Z',
|
||||||
|
updatedAt: '2023-01-04T12:00:00.000Z',
|
||||||
|
osmTags: { name: 'Middle Place' },
|
||||||
|
},
|
||||||
|
];
|
||||||
|
lists = [
|
||||||
|
{
|
||||||
|
id: 'to-go',
|
||||||
|
title: 'Want to go',
|
||||||
|
color: '#2e9e4f',
|
||||||
|
placeRefs: [
|
||||||
|
{ id: 'place-oldest', geohash: 'u33dc0' },
|
||||||
|
{ id: 'place-newest', geohash: 'u33dc0' },
|
||||||
|
{ id: 'place-middle', geohash: 'u33dc0' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
findPlaceById(id) {
|
||||||
|
return this.savedPlaces.find((p) => p.id === id) || null;
|
||||||
|
}
|
||||||
|
|
||||||
|
isPlaceSaved() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
loadPlacesInBounds() {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
getPlacesInList(listId) {
|
||||||
|
if (listId === 'to-go') {
|
||||||
|
return Promise.resolve(this.savedPlaces);
|
||||||
|
}
|
||||||
|
return Promise.resolve([]);
|
||||||
|
}
|
||||||
|
|
||||||
|
rs = {
|
||||||
|
on: () => {},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
this.owner.unregister('service:storage');
|
||||||
|
this.owner.register('service:storage', SortedMockStorageService);
|
||||||
|
|
||||||
|
await visit('/lists/to-go');
|
||||||
|
await waitFor('.places-list');
|
||||||
|
|
||||||
|
const placeNames = Array.from(
|
||||||
|
document.querySelectorAll('.places-list .place-name')
|
||||||
|
).map((el) => el.textContent.trim());
|
||||||
|
|
||||||
|
assert.deepEqual(
|
||||||
|
placeNames,
|
||||||
|
['Newest Place', 'Middle Place', 'Oldest Place'],
|
||||||
|
'Places are ordered by createdAt in descending order'
|
||||||
|
);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user