Merge pull request #9962 from vikram-raj/odc-6312

Bug 2000108: fix devconsole metrics page
openshift · Sep 1, 2021 · 7824ba4 · 7824ba4
2 parents 880f22d + d5653b8
commit 7824ba4
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/frontend/packages/dev-console/src/components/monitoring/metrics/MetricsQueryInput.tsx b/frontend/packages/dev-console/src/components/monitoring/metrics/MetricsQueryInput.tsx
@@ -70,9 +70,6 @@ const MetricsQueryInput: React.FC = () => {
     if (text && text.localeCompare(q) !== 0) {
       setTitle(CUSTOM_QUERY);
       setIsPromQlDisabled(true);
-      if (query) {
-        removeQueryArgument('query0');
-      }
     }
   }, [query, queries, CUSTOM_QUERY]);
 
@@ -105,21 +102,24 @@ const MetricsQueryInput: React.FC = () => {
       .catch(() => {});
   }, [namespace, safeFetch, dispatch]);
 
-  const onChange = (selectedValue: string) => {
-    setMetric(metricsQuery(t)[selectedValue]);
-    setChangeKey(!changeKey);
-    if (selectedValue && selectedValue === ADD_NEW_QUERY) {
-      setTitle(CUSTOM_QUERY);
-      setIsPromQlDisabled(true);
-      setShowPromQl(true);
-    } else {
-      setTitle(metricsQuery(t)[selectedValue]);
-      setIsPromQlDisabled(false);
-    }
-    if (query) {
-      removeQueryArgument('query0');
-    }
-  };
+  const onChange = React.useCallback(
+    (selectedValue: string) => {
+      setMetric(metricsQuery(t)[selectedValue]);
+      setChangeKey(!changeKey);
+      if (selectedValue && selectedValue === ADD_NEW_QUERY) {
+        setTitle(CUSTOM_QUERY);
+        setIsPromQlDisabled(true);
+        setShowPromQl(true);
+      } else {
+        setTitle(metricsQuery(t)[selectedValue]);
+        setIsPromQlDisabled(false);
+      }
+      if (query) {
+        removeQueryArgument('query0');
+      }
+    },
+    [CUSTOM_QUERY, changeKey, query, t],
+  );
 
   return (
     <>