Skip to content

Commit 6cdb61e

Browse files
frontend: replace useInfiniteQuery RPCN pipeline usage
1 parent fb81d95 commit 6cdb61e

File tree

1 file changed

+10
-25
lines changed

1 file changed

+10
-25
lines changed

frontend/src/react-query/api/pipeline.tsx

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import {
3333
} from 'protogen/redpanda/api/dataplane/v1/pipeline_pb';
3434
import type { Secret } from 'protogen/redpanda/api/dataplane/v1/secret_pb';
3535
import { MAX_PAGE_SIZE, type MessageInit, type QueryOptions } from 'react-query/react-query.utils';
36-
import { useInfiniteQueryWithAllPages } from 'react-query/use-infinite-query-with-all-pages';
3736
import { formatToastErrorMessageGRPC } from 'utils/toast.utils';
3837

3938
export const REDPANDA_CONNECT_LOGS_TOPIC = '__redpanda.connect.logs';
@@ -49,7 +48,9 @@ export const useGetPipelineQuery = (
4948
}
5049
) => {
5150
const getPipelineRequestDataPlane = create(GetPipelineRequestSchemaDataPlane, { id });
52-
const getPipelineRequest = create(GetPipelineRequestSchema, { request: getPipelineRequestDataPlane });
51+
const getPipelineRequest = create(GetPipelineRequestSchema, {
52+
request: getPipelineRequestDataPlane,
53+
});
5354
return useQuery(getPipeline, getPipelineRequest, {
5455
enabled: options?.enabled,
5556
refetchInterval: options?.refetchInterval,
@@ -80,30 +81,14 @@ export const useListPipelinesQuery = (
8081
request: listPipelinesRequestDataPlane,
8182
}) as MessageInit<ListPipelinesRequest> & Required<Pick<MessageInit<ListPipelinesRequest>, 'request'>>;
8283

83-
const listPipelinesResult = useInfiniteQueryWithAllPages(listPipelines, listPipelinesRequest, {
84-
pageParamKey: 'request',
84+
const listPipelinesResult = useQuery(listPipelines, listPipelinesRequest, {
8585
enabled: options?.enabled,
86-
// Required because of protobuf v2 reflection - it does not accept foreign fields when nested under "request", so the format needs to be a dataplane schema
87-
getNextPageParam: (lastPage) =>
88-
lastPage?.response?.nextPageToken
89-
? {
90-
...listPipelinesRequestDataPlane,
91-
pageToken: lastPage.response?.nextPageToken,
92-
}
93-
: undefined,
9486
});
9587

96-
const allRetrievedPipelines = listPipelinesResult?.data?.pages?.flatMap(({ response }) => response?.pipelines);
97-
98-
// TODO: Remove once nameContains is not required anymore
99-
// const filteredPipelines = allRetrievedPipelines?.filter(
100-
// (pipeline) => pipeline?.tags?.__redpanda_cloud_pipeline_type !== 'agent',
101-
// );
102-
10388
return {
10489
...listPipelinesResult,
10590
data: {
106-
pipelines: allRetrievedPipelines,
91+
pipelines: listPipelinesResult?.data?.response?.pipelines,
10792
},
10893
};
10994
};
@@ -116,7 +101,7 @@ export const useCreatePipelineMutation = () => {
116101
await queryClient.invalidateQueries({
117102
queryKey: createConnectQueryKey({
118103
schema: PipelineService.method.listPipelines,
119-
cardinality: 'infinite',
104+
cardinality: 'finite',
120105
}),
121106
});
122107
},
@@ -137,7 +122,7 @@ export const useUpdatePipelineMutation = () => {
137122
await queryClient.invalidateQueries({
138123
queryKey: createConnectQueryKey({
139124
schema: PipelineService.method.listPipelines,
140-
cardinality: 'infinite',
125+
cardinality: 'finite',
141126
}),
142127
});
143128
},
@@ -158,7 +143,7 @@ export const useStartPipelineMutation = () => {
158143
await queryClient.invalidateQueries({
159144
queryKey: createConnectQueryKey({
160145
schema: PipelineService.method.listPipelines,
161-
cardinality: 'infinite',
146+
cardinality: 'finite',
162147
}),
163148
});
164149
await queryClient.invalidateQueries({
@@ -186,7 +171,7 @@ export const useStopPipelineMutation = () => {
186171
await queryClient.invalidateQueries({
187172
queryKey: createConnectQueryKey({
188173
schema: PipelineService.method.listPipelines,
189-
cardinality: 'infinite',
174+
cardinality: 'finite',
190175
}),
191176
});
192177
await queryClient.invalidateQueries({
@@ -214,7 +199,7 @@ export const useDeletePipelineMutation = () => {
214199
await queryClient.invalidateQueries({
215200
queryKey: createConnectQueryKey({
216201
schema: PipelineService.method.listPipelines,
217-
cardinality: 'infinite',
202+
cardinality: 'finite',
218203
}),
219204
});
220205
},

0 commit comments

Comments
 (0)