upsertObjectArray -> syncResourceArray

contexts/ChatContext.tsx

@@ -17,7 +17,7 @@ import { useMedplum, useSubscription } from "@medplum/react-hooks";
 import { createContext, useCallback, useContext, useEffect, useMemo, useState } from "react";
 
 import type { ChatMessage, Thread } from "@/types/chat";
-import { upsertObjectArray } from "@/utils/array";
+import { syncResourceArray } from "@/utils/array";
 import { getQueryString } from "@/utils/url";
 
 function communicationToThread(
@@ -321,7 +321,7 @@ export function ChatProvider({
 
       // If this is a thread (no partOf), update thread list
       if (!communication.partOf?.length) {
-        setThreads((prev) => upsertObjectArray(prev, communication));
+        setThreads((prev) => syncResourceArray(prev, communication));
         return;
       }
 
@@ -348,7 +348,7 @@ export function ChatProvider({
         } else if (isIncoming) {
           onMessageReceived?.(communication);
         }
-        return new Map([...prev, [threadId, upsertObjectArray(existing, communication)]]);
+        return new Map([...prev, [threadId, syncResourceArray(existing, communication)]]);
       });
     },
     {
@@ -439,7 +439,7 @@ export function ChatProvider({
     });
     setThreadCommMap((prev) => {
       const existing = prev.get(currentThreadId) || [];
-      return new Map([...prev, [currentThreadId, upsertObjectArray(existing, newCommunication)]]);
+      return new Map([...prev, [currentThreadId, syncResourceArray(existing, newCommunication)]]);
     });
     setMessage("");
   }, [message, profile, currentThreadId, medplum]);
@@ -469,7 +469,7 @@ export function ChatProvider({
         const existing = prev.get(currentThreadId) || [];
         return new Map([
           ...prev,
-          [currentThreadId, upsertObjectArray(existing, updatedCommunication)],
+          [currentThreadId, syncResourceArray(existing, updatedCommunication)],
         ]);
       });
     },

utils/array.ts

@@ -1,7 +1,22 @@
-export const upsertObjectArray = <T extends { id?: string }>(arr: T[], obj: T): T[] => {
+import { Resource } from "@medplum/fhirtypes";
+
+/**
+ * Syncs an array of resources by adding the new resource if it doesn't exist,
+ * or replacing it if it does and has a newer lastUpdated date.
+ * @param arr - The array of resources.
+ * @param obj - The resource to sync.
+ * @returns The updated array of resources.
+ */
+export const syncResourceArray = <T extends Resource>(arr: T[], obj: T): T[] => {
   const existingIndex = arr.findIndex((t) => t.id != null && obj.id != null && t.id === obj.id);
   if (existingIndex !== -1) {
-    return [...arr.slice(0, existingIndex), obj, ...arr.slice(existingIndex + 1)];
+    if (
+      obj.meta?.lastUpdated != null &&
+      arr[existingIndex].meta?.lastUpdated != null &&
+      obj.meta?.lastUpdated > arr[existingIndex].meta?.lastUpdated
+    ) {
+      return [...arr.slice(0, existingIndex), obj, ...arr.slice(existingIndex + 1)];
+    }
   }
   return [...arr, obj];
 };