Merge pull request #88 from georgejkaye/sort-updated-data

[fix] Sort things after updating
georgejkaye · Feb 4, 2024 · ea96ead · ea96ead
2 parents b8462e1 + ca40d30
commit ea96ead
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
@@ -55,7 +55,8 @@ const Home = () => {
             data.breaks,
             newBreaks,
             breaksToRemove,
-            (b1, b2) => b1.id === b2.id
+            (b1, b2) => b1.id === b2.id,
+            (b1, b2) => b1.datetime.getTime() - b2.datetime.getTime()
         )
         setData({ breaks: updatedBreaks, claims: data.claims })
         return updatedBreaks
@@ -65,7 +66,8 @@ const Home = () => {
             data.claims,
             newClaims,
             claimsToRemove,
-            (c1, c2) => c1.id === c2.id
+            (c1, c2) => c1.id === c2.id,
+            (c1, c2) => c1.date.getTime() - c2.date.getTime()
         )
         setClaims(updatedClaims)
         return updatedClaims

diff --git a/client/src/app/structs.ts b/client/src/app/structs.ts
@@ -42,7 +42,8 @@ export const replaceItems = <T>(
     oldItems: T[],
     itemsToAdd: T[],
     itemsToRemove: T[],
-    eqCheck: (t1: T, t2: T) => boolean
+    eqCheck: (t1: T, t2: T) => boolean,
+    sortFn: (t1: T, t2: T) => number
 ) =>
     oldItems
         .filter(
@@ -51,6 +52,7 @@ export const replaceItems = <T>(
                 !itemsToRemove.find((remItem) => eqCheck(oldItem, remItem))
         )
         .concat(itemsToAdd)
+        .sort(sortFn)
 
 export const getDateString = (datetime: Date) => {
     let weekday = datetime.toLocaleDateString("en-GB", {