diff --git a/packages/grafana-api-clients/package.json b/packages/grafana-api-clients/package.json index 2a271c076df..79809210045 100644 --- a/packages/grafana-api-clients/package.json +++ b/packages/grafana-api-clients/package.json @@ -116,4 +116,4 @@ "@reduxjs/toolkit": "^2.8.0", "rxjs": "7.8.2" } -} \ No newline at end of file +} diff --git a/public/app/features/correlations/useCorrelations.ts b/public/app/features/correlations/useCorrelations.ts index d5601754120..c6f5b840634 100644 --- a/public/app/features/correlations/useCorrelations.ts +++ b/public/app/features/correlations/useCorrelations.ts @@ -3,9 +3,7 @@ import { lastValueFrom } from 'rxjs'; import { generatedAPI as correlationAPIv0alpha1, - CorrelationCorrelationType, Correlation as CorrelationK8s, - CorrelationList, } from '@grafana/api-clients/rtkq/correlations/v0alpha1'; import { getDataSourceSrv, @@ -145,9 +143,16 @@ export const useCorrelations = () => { const { backend } = useGrafana(); const [getInfo, get] = useAsyncFn<(params: GetCorrelationsParams) => Promise>( - (params) => { + async (params) => { if (config.featureToggles.kubernetesCorrelations) { - return toEnrichedCorrelationDataK8s(correlationAPIv0alpha1.endpoints.listCorrelation.select({})); + // the legacy version has pages , how does one accomplish this when getting a full list back? + const { data } = correlationAPIv0alpha1.endpoints.listCorrelation.useQuery({}); + const enrichedCorrelations = + data !== undefined + ? data.items.map((item) => toEnrichedCorrelationDataK8s(item)).filter((i) => i !== undefined) + : []; + // todo returning bad response data, how to fix? + return { correlations: enrichedCorrelations, page: 0, limit: 1000, totalCount: enrichedCorrelations.length }; } else { return lastValueFrom( backend.fetch({