feat: sort eventList by createdAtMillis in frontend

noshiro-pf · Mar 2, 2025 · c1ae433 · c1ae433
1 parent fa53506
commit c1ae433
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/packages/apps/event-schedule-app/src/components/pages/event-list-page/event-list-page.tsx b/packages/apps/event-schedule-app/src/components/pages/event-list-page/event-list-page.tsx
@@ -25,25 +25,32 @@ export const EventListPage = memoNamed('EventListPage', () => {
 
   const eventListWithHandler = useMemo(
     () =>
-      eventList?.map((e) =>
-        tp(
-          e,
-          () => {
-            if (fireAuthUser === undefined) return;
-            archiveEventScheduleHandler(e.eventScheduleMetadata.id, {
-              id: UserId.cast(fireAuthUser.uid),
-              name: UserName.cast(fireAuthUser.displayName ?? ''),
-            }).catch(noop);
-          },
-          () => {
-            if (fireAuthUser === undefined) return;
-            unarchiveEventScheduleHandler(e.eventScheduleMetadata.id, {
-              id: UserId.cast(fireAuthUser.uid),
-              name: UserName.cast(fireAuthUser.displayName ?? ''),
-            }).catch(noop);
-          },
+      eventList
+        // TODO: backend でソートするようにする
+        ?.toSorted(
+          (a, b) =>
+            b.eventScheduleMetadata.createdAtMillis -
+            a.eventScheduleMetadata.createdAtMillis,
+        )
+        ?.map((e) =>
+          tp(
+            e,
+            () => {
+              if (fireAuthUser === undefined) return;
+              archiveEventScheduleHandler(e.eventScheduleMetadata.id, {
+                id: UserId.cast(fireAuthUser.uid),
+                name: UserName.cast(fireAuthUser.displayName ?? ''),
+              }).catch(noop);
+            },
+            () => {
+              if (fireAuthUser === undefined) return;
+              unarchiveEventScheduleHandler(e.eventScheduleMetadata.id, {
+                id: UserId.cast(fireAuthUser.uid),
+                name: UserName.cast(fireAuthUser.displayName ?? ''),
+              }).catch(noop);
+            },
+          ),
         ),
-      ),
 
     [eventList, fireAuthUser],
   );

diff --git a/packages/apps/event-schedule-app/src/store/fetching-state/event-schedule.ts b/packages/apps/event-schedule-app/src/store/fetching-state/event-schedule.ts
@@ -2,9 +2,7 @@ import { api } from '../../api';
 import { fetchThrottleTime } from '../../constants';
 import { Router } from '../router';
 
-const [fetchEventSchedule$, fetchEventSchedule_] = createVoidEventEmitter();
-
-const fetchEventSchedule = fetchEventSchedule_;
+const [fetchEventSchedule$, fetchEventSchedule] = createVoidEventEmitter();
 
 const fetchEventScheduleThrottled$ = fetchEventSchedule$.chain(
   throttleTime(fetchThrottleTime),