Refactor date handling in AggregateUtil and XAxisUtil, and improve er…

…ror handling in MetricView and IncidentView components
OneUptime · Dec 16, 2024 · 53238ae · 53238ae
1 parent 187d41e
commit 53238ae
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/Common/Server/Types/AnalyticsDatabase/AggregateBy.ts b/Common/Server/Types/AnalyticsDatabase/AggregateBy.ts
@@ -2,6 +2,7 @@ import AggregationInterval from "Common/Types/BaseDatabase/AggregationInterval";
 import CommonAggregateBy from "Common/Types/BaseDatabase/AggregateBy";
 import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
 import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
+import OneUptimeDate from "../../../Types/Date";
 
 export default interface AggregateBy<TBaseModel extends AnalyticsBaseModel>
   extends CommonAggregateBy<TBaseModel> {
@@ -13,6 +14,9 @@ export class AggregateUtil {
     startDate: Date;
     endDate: Date;
   }): AggregationInterval {
+    data.startDate = OneUptimeDate.fromString(data.startDate);
+    data.endDate = OneUptimeDate.fromString(data.endDate);
+
     const diff: number = data.endDate.getTime() - data.startDate.getTime();
 
     if (diff <= 1000 * 60 * 60 * 3) {

diff --git a/Common/UI/Components/Charts/Utils/XAxis.ts b/Common/UI/Components/Charts/Utils/XAxis.ts
@@ -1,3 +1,4 @@
+import OneUptimeDate from "../../../../Types/Date";
 import NotImplementedException from "../../../../Types/Exception/NotImplementedException";
 import XAxisMaxMin from "../Types/XAxis/XAxisMaxMin";
 import XAxisPrecision from "../Types/XAxis/XAxisPrecision";
@@ -15,8 +16,8 @@ export default class XAxisUtil {
       throw new NotImplementedException();
     }
 
-    const startDate: Date = data.xAxisMin as Date;
-    const endDate: Date = data.xAxisMax as Date;
+    const startDate: Date = OneUptimeDate.fromString(data.xAxisMin as Date);
+    const endDate: Date = OneUptimeDate.fromString(data.xAxisMax as Date);
 
     const totalMilliseconds: number = endDate.getTime() - startDate.getTime();
     const totalSeconds: number = totalMilliseconds / 1000;

diff --git a/Dashboard/src/Components/Metrics/MetricView.tsx b/Dashboard/src/Components/Metrics/MetricView.tsx
@@ -186,6 +186,12 @@ const MetricView: FunctionComponent<ComponentProps> = (
             ],
           });
       }
+
+      if (props.data) {
+        fetchAggregatedResults().catch((err: Error) => {
+          setMetricResultsError(API.getFriendlyErrorMessage(err as Error));
+        });
+      }
     } catch (err) {
       setIsPageLoading(false);
       setPageError(API.getFriendlyErrorMessage(err as Error));

diff --git a/Dashboard/src/Pages/Incidents/View/Index.tsx b/Dashboard/src/Pages/Incidents/View/Index.tsx
@@ -723,7 +723,7 @@ const IncidentView: FunctionComponent<
         telemetryQuery.metricViewData && (
           <Card
             title={"Metrics"}
-            description={"Metrics for this incident."}
+            description={"Metrics related to this incident."}
             rightElement={
               telemetryQuery.metricViewData.startAndEndDate ? (
                 <HeaderAlert