Merge pull request #703 from openshift-cherrypick-robot/cherry-pick-696-to-release-4.21

[release-4.21] OU-1145: remove random multiplication

Author: openshift-merge-bot[bot]

web/cypress/views/metrics.ts

@@ -142,7 +142,18 @@ export const metricsPage = {
       cy.get(Classes.MenuItem).contains(interval).should('be.visible');
     });
 
+    cy.get(Classes.MenuItem).contains(MonitoringRefreshInterval.FIFTEEN_SECONDS).click();
+    cy.byTestID(DataTestIDs.MetricDropdownPollInterval).should(
+      'contain',
+      MonitoringRefreshInterval.FIFTEEN_SECONDS,
+    );
+
     cy.byTestID(DataTestIDs.MetricDropdownPollInterval).should('be.visible').click();
+    cy.get(Classes.MenuItem).contains(MonitoringRefreshInterval.REFRESH_OFF).click();
+    cy.byTestID(DataTestIDs.MetricDropdownPollInterval).should(
+      'contain',
+      MonitoringRefreshInterval.REFRESH_OFF,
+    );
   },
 
   clickAddQueryButton: () => {

web/src/components/MetricsPage.tsx

@@ -630,9 +630,8 @@ export const QueryTable: FC<QueryTableProps> = ({ index, namespace, customDataso
     (state: MonitoringState) =>
       getObserveState(plugin, state).queryBrowser.queries[index]?.isExpanded,
   );
-  const pollInterval = useSelector(
-    (state: MonitoringState) =>
-      Number(getObserveState(plugin, state).queryBrowser.pollInterval) * 15 * 1000,
+  const pollInterval = useSelector((state: MonitoringState) =>
+    Number(getObserveState(plugin, state).queryBrowser.pollInterval),
   );
   const query = useSelector(
     (state: MonitoringState) => getObserveState(plugin, state).queryBrowser.queries[index]?.query,
@@ -1248,9 +1247,8 @@ const IntervalDropdown = () => {
     (v: number) => dispatch(queryBrowserSetPollInterval(v)),
     [dispatch],
   );
-  const pollInterval = useSelector(
-    (state: MonitoringState) =>
-      Number(getObserveState(plugin, state).queryBrowser.pollInterval) * 15 * 1000,
+  const pollInterval = useSelector((state: MonitoringState) =>
+    Number(getObserveState(plugin, state).queryBrowser.pollInterval),
   );
   return <DropDownPollInterval setInterval={setInterval} selectedInterval={pollInterval} />;
 };