1.25.1

Merge pull request 'Sort collections by createdAt' (#68 ) from ui/collection_sorting into master
Reviewed-on: #68
2026-06-30 23:12:42 +02:00 · 2026-06-30 21:10:59 +00:00 · 2026-06-30 23:07:53 +02:00
7 changed files with 98 additions and 7 deletions
--- a/app/controllers/lists/list.js
+++ b/app/controllers/lists/list.js
@@ -4,6 +4,16 @@ import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 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 {
  @service router;
  @service mapUi;
@@ -73,7 +83,7 @@ export default class ListsListController extends Controller {
      }
    });

-    return merged;
+    return merged.sort((a, b) => getPlaceTime(b) - getPlaceTime(a));
  }

  @action
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "marco",
-  "version": "1.25.0",
+  "version": "1.25.1",
  "private": true,
  "description": "Unhosted maps app",
  "repository": {
--- a/release/assets/main-DNM-h3Gw.js
+++ b/release/assets/main-DNM-h3Gw.js
--- a/release/assets/modules-4-12-DxSWdffd.js
+++ b/release/assets/modules-4-12-DxSWdffd.js
--- a/release/assets/negentropy-BPzc3JMH.js
+++ b/release/assets/negentropy-BPzc3JMH.js
--- a/release/index.html
+++ b/release/index.html
@@ -39,7 +39,7 @@
    <meta name="msapplication-TileColor" content="#F6E9A6">
    <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">
 </head>
  <body>
--- a/tests/acceptance/collections-test.js
+++ b/tests/acceptance/collections-test.js
@@ -135,4 +135,85 @@ module('Acceptance | collections navigation', function (hooks) {
      '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'
+    );
+  });
 });
Author	SHA1	Message	Date
Râu Cao	39dca446ac	1.25.1 All checks were successful CI / Lint (push) Successful in 33s Details CI / Test (push) Successful in 57s Details	2026-06-30 23:12:42 +02:00
Râu Cao	2e6827f0d0	Merge pull request 'Sort collections by createdAt' (#68 ) from ui/collection_sorting into master All checks were successful CI / Lint (push) Successful in 33s Details CI / Test (push) Successful in 56s Details Reviewed-on: #68	2026-06-30 21:10:59 +00:00
Râu Cao	8c3a805684	Sort collections by createdAt All checks were successful CI / Lint (pull_request) Successful in 34s Details CI / Test (pull_request) Successful in 57s Details Release Drafter / Update release notes draft (pull_request) Successful in 8s Details	2026-06-30 23:07:53 +02:00