diff --git a/frontend/src/pages/MetricApplication/index.tsx b/frontend/src/pages/MetricApplication/index.tsx index 49f6c6aedd..aa08c48506 100644 --- a/frontend/src/pages/MetricApplication/index.tsx +++ b/frontend/src/pages/MetricApplication/index.tsx @@ -20,7 +20,7 @@ const MetricsApplication = ({ getInitialData, resetInitialData, }: MetricsProps): JSX.Element => { - const { selectedTime } = useSelector( + const { minTime, maxTime } = useSelector( (state) => state.globalTime, ); const { error, errorMessage, metricsApplicationLoading } = useSelector< @@ -33,15 +33,16 @@ const MetricsApplication = ({ useEffect(() => { if (servicename !== undefined) { getInitialData({ - selectedTimeInterval: selectedTime, serviceName: servicename, + maxTime, + minTime, }); } return (): void => { resetInitialData(); }; - }, [servicename, getInitialData, selectedTime, resetInitialData]); + }, [servicename, getInitialData, resetInitialData, maxTime, minTime]); if (metricsApplicationLoading) { return ; diff --git a/frontend/src/store/actions/metrics/getInitialData.ts b/frontend/src/store/actions/metrics/getInitialData.ts index 18be7f6995..7c43fc0427 100644 --- a/frontend/src/store/actions/metrics/getInitialData.ts +++ b/frontend/src/store/actions/metrics/getInitialData.ts @@ -22,7 +22,10 @@ export const GetInitialData = ( /** * @description This is because we keeping the store as source of truth */ - if (props.selectedTimeInterval !== globalTime.selectedTime) { + if ( + props.maxTime !== globalTime.maxTime && + props.minTime !== globalTime.minTime + ) { return; } @@ -30,7 +33,7 @@ export const GetInitialData = ( type: 'GET_INITIAL_APPLICATION_LOADING', }); - const { maxTime, minTime } = GetMinMax(props.selectedTimeInterval, [ + const { maxTime, minTime } = GetMinMax(globalTime.selectedTime, [ globalTime.minTime / 1000000, globalTime.maxTime / 1000000, ]); @@ -117,5 +120,6 @@ export const GetInitialData = ( export interface GetInitialDataProps { serviceName: Props['service']; - selectedTimeInterval: GlobalReducer['selectedTime']; + maxTime: GlobalReducer['maxTime']; + minTime: GlobalReducer['minTime']; }