fix: health checks

Slick-Telemetry · Jun 10, 2024 · ba9c46f · ba9c46f
1 parent 4027a82
commit ba9c46f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/app/api/fetchEvents.ts b/src/app/api/fetchEvents.ts
@@ -18,14 +18,22 @@ export const fetchEventList = atomEffect(
     const season = get(SeasonState);
     const params = season && `?year=${season}`;
 
+    // TODO: Prevent fetch if not connected
+    // ! Bug with serverConnectedState not updating
+    // const connected = get(serverConnectedState);
+    // if (!connected) {
+    //   return;
+    // }
+
     // Fetch event list from api
     fetchAPI('schedule' + params).then(
       (res: DataConfigSchema['schedule'] | ServerErrorResponse) => {
         const schedule = res as DataConfigSchema['schedule'];
         const error = res as ServerErrorResponse;
 
         // *** If errors specific prop, detail, update serverErrorState
-        if (error.detail) {
+        if (!schedule) return;
+        if (error && error.detail) {
           set(serverErrorState, error.detail[0].msg);
           return;
         }
@@ -43,7 +51,7 @@ export const fetchEventList = atomEffect(
 
         set(EventListState, completedEvents);
 
-        // *** If no season sync default year with server provided season
+        // *** If no season, sync default year with server provided season
         if (!season) {
           set(SeasonState, schedule.year);
         }

diff --git a/src/app/api/fetchHealth.ts b/src/app/api/fetchHealth.ts
@@ -14,15 +14,16 @@ export const fetchHealth = atomEffect(
 
     // Fetch event list from api
     fetchAPI('health').then((res: { status: string } | ServerErrorResponse) => {
+      const success = res as { status: string };
       const error = res as ServerErrorResponse;
 
-      if ('status' in res) {
+      if (success && success.status) {
         set(serverConnectedState, true);
         return;
       }
 
       // *** If errors specific prop, detail, update serverErrorState
-      if (error.detail) {
+      if (error && error.detail) {
         set(serverErrorState, error.detail[0].msg);
         return;
       }