Fix HealthCheck

crni99 · Jan 9, 2025 · f96acf3 · f96acf3
1 parent 16e17cf
commit f96acf3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/components/common/HealthCheck.jsx b/src/components/common/HealthCheck.jsx
@@ -1,10 +1,18 @@
 import React from 'react';
 import useFetch from "../../hooks/useFetch";
 import Alert from '../common/Alert';
+import { Entities } from '../../utils/const.js';
 
 // Not working properly if there isn't connection with the API
 export default function HealthCheck() {
-    const { data, error, isLoading, isError } = useFetch('HealthCheck', null);
+    const { data, dataExist, error, isLoading, isError } = useFetch(Entities.HEALTH_CHECKS, null, null, null);
+
+    const extractErrorMessage = (error) => {
+        if (error && error.message) {
+            return error.message;
+        }
+        return "An unknown error occurred";
+    };
 
     return (
         <div className="container mt-5">
@@ -14,8 +22,8 @@ export default function HealthCheck() {
             <div className="form-horizontal">
                 <div className="form-group">
                     {isLoading && <Alert alertType="info" alertText="Loading..." />}
-                    {isError && error && <Alert alertType="error" alertText={error} />}
-                    {data && !isError && !error ? (
+                    {isError && error && <Alert alertType="error" alertText={extractErrorMessage(error)} />}
+                    {data && dataExist && !isError && !error ? (
                         <div>
                             <dl className="row">
                                 <dt className="col-sm-2">Status</dt>

diff --git a/src/hooks/useFetch.jsx b/src/hooks/useFetch.jsx
@@ -119,6 +119,9 @@ export default function useFetch(dataType, dataId, page = 1, triggerFetch) {
                     }
                     break;
 
+                case Entities.HEALTH_CHECKS:
+                    return `${apiUrl}/${dataType}`;
+
                 default:
                     url = `${apiUrl}/${dataType}?${paginationParams}`;
                     break;

diff --git a/src/utils/const.js b/src/utils/const.js
@@ -7,4 +7,5 @@ export const Entities = {
     PILOTS: 'Pilots',
     PLANE_TICKETS: 'PlaneTickets',
     TRAVEL_CLASSES: 'TravelClasses',
+    HEALTH_CHECKS: 'HealthCheck',
 };