diff --git a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardChartComponent.tsx b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardChartComponent.tsx index 62e0b58a98..af2323c39c 100644 --- a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardChartComponent.tsx +++ b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardChartComponent.tsx @@ -142,10 +142,6 @@ const DashboardChartComponentElement: FunctionComponent = ( props.component.arguments.metricQueryConfigs, ]); - useEffect(() => { - fetchAggregatedResults(); - }, []); - if (isLoading) { return ; } diff --git a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardGaugeComponent.tsx b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardGaugeComponent.tsx index 29f3a5932d..75b8cb9bb8 100644 --- a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardGaugeComponent.tsx +++ b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardGaugeComponent.tsx @@ -100,10 +100,6 @@ const DashboardGaugeComponentElement: FunctionComponent = ( fetchAggregatedResults(); }, [props.dashboardStartAndEndDate, props.metricTypes, props.refreshTick]); - useEffect(() => { - fetchAggregatedResults(); - }, []); - useEffect(() => { if ( JSONFunctions.isJSONObjectDifferent( diff --git a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTableComponent.tsx b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTableComponent.tsx index f5721be604..e7eec1027c 100644 --- a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTableComponent.tsx +++ b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardTableComponent.tsx @@ -113,10 +113,6 @@ const DashboardTableComponentElement: FunctionComponent = ( } }, [props.component.arguments.metricQueryConfig]); - useEffect(() => { - fetchAggregatedResults(); - }, []); - if (isLoading) { return ; } diff --git a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardValueComponent.tsx b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardValueComponent.tsx index 25dce6daa3..20d3c246bf 100644 --- a/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardValueComponent.tsx +++ b/App/FeatureSet/Dashboard/src/Components/Dashboard/Components/DashboardValueComponent.tsx @@ -6,7 +6,7 @@ import { PromiseVoidFunction } from "Common/Types/FunctionTypes"; import MetricViewData from "Common/Types/Metrics/MetricViewData"; import MetricUtil from "../../Metrics/Utils/Metrics"; import API from "Common/UI/Utils/API/API"; -import DashboardValueComponent from "Common/Types/Dashboard/DashboardComponents/DashboardValueComponent"; +import DashboardValueComponentType from "Common/Types/Dashboard/DashboardComponents/DashboardValueComponent"; import AggregationType from "Common/Types/BaseDatabase/AggregationType"; import MetricQueryConfigData from "Common/Types/Metrics/MetricQueryConfigData"; import JSONFunctions from "Common/Types/JSONFunctions"; @@ -15,10 +15,10 @@ import MetricType from "Common/Models/DatabaseModels/MetricType"; import { RangeStartAndEndDateTimeUtil } from "Common/Types/Time/RangeStartAndEndDateTime"; export interface ComponentProps extends DashboardBaseComponentProps { - component: DashboardValueComponent; + component: DashboardValueComponentType; } -const DashboardValueComponent: FunctionComponent = ( +const DashboardValueComponentElement: FunctionComponent = ( props: ComponentProps, ): ReactElement => { const [metricResults, setMetricResults] = React.useState< @@ -101,10 +101,6 @@ const DashboardValueComponent: FunctionComponent = ( fetchAggregatedResults(); }, [props.dashboardStartAndEndDate, props.metricTypes, props.refreshTick]); - useEffect(() => { - fetchAggregatedResults(); - }, []); - useEffect(() => { // set metricQueryConfig to the new value only if it is different from the previous value if ( @@ -218,4 +214,4 @@ const DashboardValueComponent: FunctionComponent = ( ); }; -export default DashboardValueComponent; +export default DashboardValueComponentElement;