Use initialPromisePurity for prometheus range queries in DW

Signed-off-by: Mike Turley <[email protected]>
opendatahub-io · Mar 14, 2024 · ef81fd9 · ef81fd9
1 parent 29bb4be
commit ef81fd9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/frontend/src/api/prometheus/distributedWorkloads.ts b/frontend/src/api/prometheus/distributedWorkloads.ts
@@ -160,6 +160,7 @@ export const useDWWorkloadTrendMetrics = (
       defaultResponsePredicate,
       namespace || '',
       '/api/prometheus/queryRange',
+      { initialPromisePurity: true },
     ),
     jobsInadmissibleTrend: useQueryRangeResourceData(
       !!queries,
@@ -169,6 +170,7 @@ export const useDWWorkloadTrendMetrics = (
       defaultResponsePredicate,
       namespace || '',
       '/api/prometheus/queryRange',
+      { initialPromisePurity: true },
     ),
     jobsPendingTrend: useQueryRangeResourceData(
       !!queries,
@@ -178,6 +180,7 @@ export const useDWWorkloadTrendMetrics = (
       defaultResponsePredicate,
       namespace || '',
       '/api/prometheus/queryRange',
+      { initialPromisePurity: true },
     ),
   };
 

diff --git a/frontend/src/api/prometheus/usePrometheusQueryRange.ts b/frontend/src/api/prometheus/usePrometheusQueryRange.ts
@@ -2,6 +2,7 @@ import * as React from 'react';
 import axios from 'axios';
 
 import useFetchState, {
+  FetchOptions,
   FetchState,
   FetchStateCallbackPromise,
   NotReadyError,
@@ -26,6 +27,7 @@ const usePrometheusQueryRange = <T = PrometheusQueryRangeResultValue>(
   step: number,
   responsePredicate: ResponsePredicate<T>,
   namespace: string,
+  fetchOptions?: Partial<FetchOptions>,
 ): [...FetchState<T[]>, boolean] => {
   const pendingRef = React.useRef(active);
   const fetchData = React.useCallback<FetchStateCallbackPromise<T[]>>(() => {
@@ -59,7 +61,7 @@ const usePrometheusQueryRange = <T = PrometheusQueryRangeResultValue>(
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [active, fetchData]);
 
-  return [...useFetchState<T[]>(fetchData, []), pendingRef.current];
+  return [...useFetchState<T[]>(fetchData, [], fetchOptions), pendingRef.current];
 };
 
 export const defaultResponsePredicate: ResponsePredicate = (data) => data.result?.[0]?.values || [];

diff --git a/frontend/src/api/prometheus/useQueryRangeResourceData.ts b/frontend/src/api/prometheus/useQueryRangeResourceData.ts
@@ -2,6 +2,7 @@
 import { TimeframeStep, TimeframeTimeRange } from '~/pages/modelServing/screens/const';
 import { PrometheusQueryRangeResultValue } from '~/types';
 import useRestructureContextResourceData from '~/utilities/useRestructureContextResourceData';
+import { FetchOptions } from '~/utilities/useFetchState';
 import { TimeframeTitle } from '~/pages/modelServing/screens/types';
 import usePrometheusQueryRange, { ResponsePredicate } from './usePrometheusQueryRange';
 
@@ -14,6 +15,7 @@ const useQueryRangeResourceData = <T = PrometheusQueryRangeResultValue>(
   responsePredicate: ResponsePredicate<T>,
   namespace: string,
   apiPath = '/api/prometheus/serving',
+  fetchOptions?: Partial<FetchOptions>,
 ): ReturnType<typeof useRestructureContextResourceData<T>> =>
   useRestructureContextResourceData<T>(
     usePrometheusQueryRange<T>(
@@ -25,6 +27,7 @@ const useQueryRangeResourceData = <T = PrometheusQueryRangeResultValue>(
       TimeframeStep[timeframe],
       responsePredicate,
       namespace,
+      fetchOptions,
     ),
   );
 

diff --git a/frontend/src/concepts/distributedWorkloads/useWorkloads.ts b/frontend/src/concepts/distributedWorkloads/useWorkloads.ts
@@ -14,7 +14,7 @@ const useWorkloads = (namespace?: string, refreshRate = 0): FetchState<WorkloadK
       return listWorkloads(namespace);
     }, [dwEnabled, namespace]),
     [],
-    { refreshRate },
+    { refreshRate, initialPromisePurity: true },
   );
 };