fix(dashboard): performance dans le chargement des données (#1675)

SocialGouv · Sep 27, 2023 · 8e6d0dd · 8e6d0dd
1 parent 95de228
commit 8e6d0dd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/app/src/components/Loader.js b/app/src/components/Loader.js
@@ -56,9 +56,12 @@ export const refreshTriggerState = atom({
 });
 
 export const mergeItems = (oldItems, newItems = []) => {
-  const newItemsIds = newItems?.map((i) => i._id) || [];
-  const oldItemsPurged = oldItems.filter((i) => !newItemsIds.includes(i._id));
-  return [...oldItemsPurged, ...newItems].filter((e) => !e.deletedAt);
+  const newItemIds = {};
+  for (const newItem of newItems) {
+    newItemIds[newItem._id] = true;
+  }
+  const oldItemsPurged = oldItems.filter((item) => !newItemIds[item._id] && !item.deletedAt);
+  return [...oldItemsPurged, ...newItems.filter((item) => !item.deletedAt)];
 };
 
 export const DataLoader = () => {

diff --git a/dashboard/src/components/DataLoader.js b/dashboard/src/components/DataLoader.js
@@ -468,9 +468,12 @@ export function useDataLoader(options = { refreshOnMount: false }) {
 }
 
 export const mergeItems = (oldItems, newItems = []) => {
-  const newItemsIds = newItems?.map((i) => i._id) || [];
-  const oldItemsPurged = oldItems.filter((i) => !newItemsIds.includes(i._id));
-  return [...oldItemsPurged, ...newItems].filter((e) => !e.deletedAt);
+  const newItemIds = {};
+  for (const newItem of newItems) {
+    newItemIds[newItem._id] = true;
+  }
+  const oldItemsPurged = oldItems.filter((item) => !newItemIds[item._id] && !item.deletedAt);
+  return [...oldItemsPurged, ...newItems.filter((item) => !item.deletedAt)];
 };
 
 const FullScreenContainer = styled.div`