From c9a2922c829e6608a444bebd41dc981447c21a80 Mon Sep 17 00:00:00 2001
From: Jannik Hollenbach <jannik@hollenbach.de>
Date: Sat, 14 Dec 2024 18:03:05 +0100
Subject: [PATCH] Fix status page not loading the status correctly on initial
 load

---
 balancer/ui/src/pages/ScoreOverview.tsx  |  6 -----
 balancer/ui/src/pages/TeamStatusPage.tsx | 29 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/balancer/ui/src/pages/ScoreOverview.tsx b/balancer/ui/src/pages/ScoreOverview.tsx
index d7e20d02..bc10cfe3 100644
--- a/balancer/ui/src/pages/ScoreOverview.tsx
+++ b/balancer/ui/src/pages/ScoreOverview.tsx
@@ -46,12 +46,6 @@ export default function ScoreOverviewPage({
         3000,
         5000 - (Date.now() - lastUpdateStarted.getTime())
       );
-      console.log(
-        "Waited for",
-        Date.now() - lastUpdateStarted.getTime(),
-        "ms for status update"
-      );
-      console.log("Waiting for", waitTime, "ms until starting next request");
       timeout = window.setTimeout(() => updateScoreData(new Date()), waitTime);
     } catch (err) {
       console.error("Failed to fetch current teams!", err);
diff --git a/balancer/ui/src/pages/TeamStatusPage.tsx b/balancer/ui/src/pages/TeamStatusPage.tsx
index 266b0658..778fd453 100644
--- a/balancer/ui/src/pages/TeamStatusPage.tsx
+++ b/balancer/ui/src/pages/TeamStatusPage.tsx
@@ -105,10 +105,17 @@ const PasscodeResetButton = ({ team }: { team: string }) => {
   );
 };
 
-async function fetchTeamStatusData(): Promise<TeamStatusResponse | null> {
-  const response = await fetch(
-    `/balancer/api/teams/status?wait-for-update-after=${new Date().toISOString()}`
-  );
+async function fetchTeamStatusData(
+  lastSeen: Date | null
+): Promise<TeamStatusResponse | null> {
+  let response: Response;
+  if (lastSeen) {
+    response = await fetch(
+      `/balancer/api/teams/status?wait-for-update-after=${lastSeen.toISOString()}`
+    );
+  } else {
+    response = await fetch("/balancer/api/teams/status");
+  }
   if (!response.ok) {
     throw new Error("Failed to fetch current teams");
   }
@@ -134,25 +141,29 @@ export const TeamStatusPage = ({
   const passcode: string | null = state?.passcode || null;
 
   let timeout: number | null = null;
-  async function updateStatusData() {
+  async function updateStatusData(lastSuccessfulUpdate: Date | null) {
     try {
-      const status = await fetchTeamStatusData();
+      console.log("Updating status data", { lastSuccessfulUpdate });
+      const status = await fetchTeamStatusData(lastSuccessfulUpdate);
       if (status === null) {
         // no update available restarting polling with slight delay to not accidentally dos the server
-        timeout = window.setTimeout(() => updateStatusData(), 1000);
+        timeout = window.setTimeout(
+          () => updateStatusData(lastSuccessfulUpdate),
+          1000
+        );
         return;
       }
       setInstanceStatus(status);
       setActiveTeam(status.name);
       const waitTime = status.readiness ? 5000 : 1000; // poll faster when not ready, as the instance is starting and we want to show the user the status as soon as possible
-      timeout = window.setTimeout(() => updateStatusData(), waitTime);
+      timeout = window.setTimeout(() => updateStatusData(new Date()), waitTime);
     } catch (err) {
       console.error("Failed to fetch current teams!", err);
     }
   }
 
   useEffect(() => {
-    updateStatusData();
+    updateStatusData(null);
     return () => {
       if (timeout !== null) {
         clearTimeout(timeout);