github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

feat: Refactor DashboardStartAndEndDate to RangeStartAndEndDateTime across multiple components

Browse Source
This commit is contained in:
Simon Larsen
2025-05-15 19:24:09 +01:00
parent ae75c73747
commit 4b78ff4c32
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Types/Time/RangeStartAndEndDateTime.ts
View File

@@ -7,7 +7,7 @@ export default interface RangestartAndEndDateTime {
range: TimeRange;
}
export class DashboardStartAndEndDateUtil {
export class RangeStartAndEndDateTimeUtil {
public static getStartAndEndDate(
dashboardStartAndEndDate: RangestartAndEndDateTime,
): InBetween<Date> {

4
Dashboard/src/Components/Dashboard/Canvas/Index.tsx
View File

@@ -9,7 +9,7 @@ import { GetReactElementFunction } from "Common/UI/Types/FunctionTypes";
import ObjectID from "Common/Types/ObjectID";
import ComponentSettingsSideOver from "./ComponentSettingsSideOver";
import JSONFunctions from "Common/Types/JSONFunctions";
import DashboardStartAndEndDate from "../Types/DashboardStartAndEndDate";
import RangeStartAndEndDateTime from "Common/Types/Time/RangeStartAndEndDateTime";
import MetricType from "Common/Models/DatabaseModels/MetricType";
export interface ComponentProps {
@@ -24,7 +24,7 @@ export interface ComponentProps {
metricTypes: Array<MetricType>;
telemetryAttributes: string[];
};
dashboardStartAndEndDate: DashboardStartAndEndDate;
dashboardStartAndEndDate: RangeStartAndEndDateTime;
}
const DashboardCanvas: FunctionComponent<ComponentProps> = (

4
Dashboard/src/Components/Dashboard/Components/DashboardBaseComponent.tsx
View File

@@ -18,7 +18,7 @@ import { GetReactElementFunction } from "Common/UI/Types/FunctionTypes";
import DashboardViewConfig from "Common/Types/Dashboard/DashboardViewConfig";
import ObjectID from "Common/Types/ObjectID";
import DashboardComponentType from "Common/Types/Dashboard/DashboardComponentType";
import DashboardStartAndEndDate from "../Types/DashboardStartAndEndDate";
import RangeStartAndEndDateTime from "Common/Types/Time/RangeStartAndEndDateTime";
import MetricType from "Common/Models/DatabaseModels/MetricType";
export interface DashboardBaseComponentProps {
@@ -35,7 +35,7 @@ export interface DashboardBaseComponentProps {
dashboardComponentHeightInPx: number;
dashboardComponentWidthInPx: number;
dashboardViewConfig: DashboardViewConfig;
dashboardStartAndEndDate: DashboardStartAndEndDate;
dashboardStartAndEndDate: RangeStartAndEndDateTime;
metricTypes: Array<MetricType>;
}

6
Dashboard/src/Components/Dashboard/Components/DashboardChartComponent.tsx
View File

@@ -3,7 +3,6 @@ import DashboardChartComponent from "Common/Types/Dashboard/DashboardComponents/
import { DashboardBaseComponentProps } from "./DashboardBaseComponent";
import MetricCharts from "../../Metrics/MetricCharts";
import AggregatedResult from "Common/Types/BaseDatabase/AggregatedResult";
import { DashboardStartAndEndDateUtil } from "../Types/DashboardStartAndEndDate";
import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
import MetricViewData from "Common/Types/Metrics/MetricViewData";
@@ -14,6 +13,7 @@ import JSONFunctions from "Common/Types/JSONFunctions";
import MetricQueryConfigData from "Common/Types/Metrics/MetricQueryConfigData";
import Icon from "Common/UI/Components/Icon/Icon";
import IconProp from "Common/Types/Icon/IconProp";
import { RangeStartAndEndDateTimeUtil } from "Common/Types/Time/RangeStartAndEndDateTime";
export interface ComponentProps extends DashboardBaseComponentProps {
component: DashboardChartComponent;
@@ -32,7 +32,7 @@ const DashboardChartComponentElement: FunctionComponent<ComponentProps> = (
queryConfigs: props.component.arguments.metricQueryConfig
? [props.component.arguments.metricQueryConfig]
: [],
startAndEndDate: DashboardStartAndEndDateUtil.getStartAndEndDate(
startAndEndDate: RangeStartAndEndDateTimeUtil.getStartAndEndDate(
props.dashboardStartAndEndDate,
),
formulaConfigs: [],
@@ -157,7 +157,7 @@ const DashboardChartComponentElement: FunctionComponent<ComponentProps> = (
},
]
: [],
startAndEndDate: DashboardStartAndEndDateUtil.getStartAndEndDate(
startAndEndDate: RangeStartAndEndDateTimeUtil.getStartAndEndDate(
props.dashboardStartAndEndDate,
),
formulaConfigs: [],

4
Dashboard/src/Components/Dashboard/Components/DashboardValueComponent.tsx
View File

@@ -1,7 +1,6 @@
import React, { FunctionComponent, ReactElement, useEffect } from "react";
import { DashboardBaseComponentProps } from "./DashboardBaseComponent";
import AggregatedResult from "Common/Types/BaseDatabase/AggregatedResult";
import { DashboardStartAndEndDateUtil } from "../Types/DashboardStartAndEndDate";
import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
import MetricViewData from "Common/Types/Metrics/MetricViewData";
@@ -13,6 +12,7 @@ import MetricQueryConfigData from "Common/Types/Metrics/MetricQueryConfigData";
import JSONFunctions from "Common/Types/JSONFunctions";
import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";
import MetricType from "Common/Models/DatabaseModels/MetricType";
import { RangeStartAndEndDateTimeUtil } from "Common/Types/Time/RangeStartAndEndDateTime";
export interface ComponentProps extends DashboardBaseComponentProps {
component: DashboardValueComponent;
@@ -34,7 +34,7 @@ const DashboardValueComponent: FunctionComponent<ComponentProps> = (
queryConfigs: props.component.arguments.metricQueryConfig
? [props.component.arguments.metricQueryConfig]
: [],
startAndEndDate: DashboardStartAndEndDateUtil.getStartAndEndDate(
startAndEndDate: RangeStartAndEndDateTimeUtil.getStartAndEndDate(
props.dashboardStartAndEndDate,
),
formulaConfigs: [],