Re-arrange promise logic for message-count-week-chart

usdot-jpo-ode · May 29, 2024 · 32a0c07 · 32a0c07
1 parent c3988f9
commit 32a0c07
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/gui/src/components/message-counts/message-count-week-chart.tsx b/gui/src/components/message-counts/message-count-week-chart.tsx
@@ -24,6 +24,7 @@ export const MessageCountWeekChart = (props: {
   type ChartData = { date: string; count: number; dayOfWeek: string };
 
   const [messageCounts, setMessageCounts] = useState<ChartData[]>([]);
+  let promises: Promise<{ date: string; count: number; dayOfWeek: string; }>[] = [];
 
 useEffect(() => {
   if (accessToken) {
@@ -45,20 +46,23 @@ useEffect(() => {
         dayStart,
         dayEnd
       );
-      messageCountPromise
-        .then((count) => {
-          weekCounts[i] = { 
-            date: dayStart.toLocaleDateString(undefined, { month: '2-digit', day: '2-digit' }), 
+      promises.push(
+        messageCountPromise.then((count) => {
+          return {
+            date: dayStart.toLocaleDateString(undefined, { month: '2-digit', day: '2-digit' }),
             count: count,
             dayOfWeek: dayStart.toLocaleDateString(undefined, { weekday: 'long' })
           };
-          if (i === 6) {
-            setMessageCounts(weekCounts);
-        }
         })
-        .catch((error) => console.error(error));
-
+      );
     }
+
+    Promise.all(promises)
+  .then((weekCounts) => {
+    setMessageCounts(weekCounts);
+  })
+  .catch((error) => console.error(error));
+
   }
 }, [intersectionId]);