From 5414a73b409be584be0a06cb5dee98eb2190d36d Mon Sep 17 00:00:00 2001
From: pal-sig <88981777+pal-sig@users.noreply.github.com>
Date: Fri, 3 Dec 2021 18:42:45 +0530
Subject: [PATCH] bug(fix): refresh is fixed in the application page (#445)

---
 frontend/src/pages/Metrics/index.tsx             |  8 +++++---
 frontend/src/store/actions/metrics/getService.ts | 10 +++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/src/pages/Metrics/index.tsx b/frontend/src/pages/Metrics/index.tsx
index cc0cfa328f..a6cb2dce3d 100644
--- a/frontend/src/pages/Metrics/index.tsx
+++ b/frontend/src/pages/Metrics/index.tsx
@@ -25,10 +25,11 @@ const Metrics = ({ getService }: MetricsProps): JSX.Element => {
 	useEffect(() => {
 		if (loading === false) {
 			getService({
-				selectedTimeInterval: selectedTime,
+				maxTime,
+				minTime,
 			});
 		}
-	}, [getService, loading, selectedTime]);
+	}, [getService, loading, maxTime, minTime]);
 
 	useEffect(() => {
 		let timeInterval: NodeJS.Timeout;
@@ -36,7 +37,8 @@ const Metrics = ({ getService }: MetricsProps): JSX.Element => {
 		if (loading === false && !isSkipped && services.length === 0) {
 			timeInterval = setInterval(() => {
 				getService({
-					selectedTimeInterval: selectedTime,
+					maxTime,
+					minTime,
 				});
 			}, 50000);
 		}
diff --git a/frontend/src/store/actions/metrics/getService.ts b/frontend/src/store/actions/metrics/getService.ts
index eaf554a9d9..bdc751a777 100644
--- a/frontend/src/store/actions/metrics/getService.ts
+++ b/frontend/src/store/actions/metrics/getService.ts
@@ -13,11 +13,14 @@ export const GetService = (
 		try {
 			const { globalTime } = getState();
 
-			if (props.selectedTimeInterval !== globalTime.selectedTime) {
+			if (
+				props.maxTime !== globalTime.maxTime &&
+				props.minTime !== globalTime.minTime
+			) {
 				return;
 			}
 
-			const { maxTime, minTime } = GetMinMax(props.selectedTimeInterval, [
+			const { maxTime, minTime } = GetMinMax(globalTime.selectedTime, [
 				globalTime.minTime / 1000000,
 				globalTime.maxTime / 1000000,
 			]);
@@ -56,5 +59,6 @@ export const GetService = (
 };
 
 export type GetServiceProps = {
-	selectedTimeInterval: GlobalReducer['selectedTime'];
+	minTime: GlobalReducer['minTime'];
+	maxTime: GlobalReducer['maxTime'];
 };