Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI v2] feat: adds query to join flow runs with parent flow #17217

Merged
merged 1 commit into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { usePaginateFlowRunswithFlows } from "./use-paginate-flow-runs-with-flows";
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import { createFakeFlow, createFakeFlowRun } from "@/mocks";

import type { FlowRun } from "@/api/flow-runs";
import type { Flow } from "@/api/flows";

import { QueryClient } from "@tanstack/react-query";
import { renderHook, waitFor } from "@testing-library/react";
import { buildApiUrl, createWrapper, server } from "@tests/utils";
import { http, HttpResponse } from "msw";
import { describe, expect, it } from "vitest";
import { usePaginateFlowRunswithFlows } from "./use-paginate-flow-runs-with-flows";

describe("usePaginateFlowRunswithFlows", () => {
const mockPaginateFlowRunsAPI = (flowRuns: Array<FlowRun>) => {
server.use(
http.post(buildApiUrl("/flow_runs/paginate"), () => {
return HttpResponse.json({
limit: 10,
page: 1,
pages: 1,
results: flowRuns,
count: flowRuns.length,
});
}),
);
};

const mockFilterFlowsAPI = (flows: Array<Flow>) => {
server.use(
http.post(buildApiUrl("/flows/filter"), () => {
return HttpResponse.json(flows);
}),
);
};

it("returns a pagination object with no results", async () => {
// SETUP
const queryClient = new QueryClient();

mockPaginateFlowRunsAPI([]);

// TEST
const { result } = renderHook(
() => usePaginateFlowRunswithFlows({ page: 1, sort: "NAME_ASC" }),
{ wrapper: createWrapper({ queryClient }) },
);

await waitFor(() => expect(result.current.status).toEqual("success"));
expect(result.current.data?.results).toHaveLength(0);
});

it("returns a pagination object with joined flows and flow runs", async () => {
// SETUP
const queryClient = new QueryClient();
const MOCK_FLOW_RUN_0 = createFakeFlowRun({
id: "0",
flow_id: "flow-id-0",
});
const MOCK_FLOW_RUN_1 = createFakeFlowRun({
id: "0",
flow_id: "flow-id-0",
});
const MOCK_FLOW_RUN_2 = createFakeFlowRun({
id: "0",
flow_id: "flow-id-1",
});
const MOCK_FLOW_0 = createFakeFlow({ id: "flow-id-0" });
const MOCK_FLOW_1 = createFakeFlow({ id: "flow-id-1" });

const mockFlowRuns = [MOCK_FLOW_RUN_0, MOCK_FLOW_RUN_1, MOCK_FLOW_RUN_2];
const mockFlows = [MOCK_FLOW_0, MOCK_FLOW_1];
mockPaginateFlowRunsAPI(mockFlowRuns);
mockFilterFlowsAPI(mockFlows);

// TEST
const { result } = renderHook(
() => usePaginateFlowRunswithFlows({ page: 1, sort: "NAME_ASC" }),
{ wrapper: createWrapper({ queryClient }) },
);

await waitFor(() => expect(result.current.status).toEqual("success"));

// ASSERT
const EXPECTED = [
{
...MOCK_FLOW_RUN_0,
flow: MOCK_FLOW_0,
},
{
...MOCK_FLOW_RUN_1,
flow: MOCK_FLOW_0,
},
{
...MOCK_FLOW_RUN_2,
flow: MOCK_FLOW_1,
},
];

expect(result.current.data?.results).toEqual(EXPECTED);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
import {
FlowRunWithFlow,
type FlowRunsPaginateFilter,
buildPaginateFlowRunsQuery,
} from "@/api/flow-runs";
import { Flow, buildListFlowsQuery } from "@/api/flows";
import { useQuery } from "@tanstack/react-query";
import { useMemo } from "react";

/**
*
* @param filter
* @returns a simplified query object that joins a flow run's pagination data with it's parent flow
*/
export const usePaginateFlowRunswithFlows = (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would we be better off creating a single query action that does this? That way we can await the flow runs, await the flows, and then combine them. And then we can just use a normal query rather than this custom hook with its custom pending an error states.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember seeing a thread with @desertaxle where we would want to do it this way, so that we won't find ourselves writing so many specific queries for joining data.

Should we continue doing this way?
I do see the benefit of having nice RQ object, but it can become an anti pattern to write specific joining queries vs using re-usable query configs.

@devangrose @desertaxle Any thoughts on how we should continue joining data?

filter: FlowRunsPaginateFilter,
) => {
const { data: paginateFlowRunsData, error: paginateFlowRunsError } = useQuery(
buildPaginateFlowRunsQuery(filter),
);

const flowIds = useMemo(() => {
if (!paginateFlowRunsData) {
return [];
}
return paginateFlowRunsData.results.map((flowRun) => flowRun.flow_id);
}, [paginateFlowRunsData]);

const { data: flows, error: flowsError } = useQuery(
buildListFlowsQuery(
{
flows: { id: { any_: flowIds }, operator: "and_" },
offset: 0,
sort: "CREATED_DESC",
},
{ enabled: flowIds.length > 0 },
),
);

const flowMap = useMemo(() => {
if (!flows) {
return new Map<string, Flow>();
}
return new Map(flows.map((flow) => [flow.id, flow]));
}, [flows]);

// If there's no results from the query, return empty
if (paginateFlowRunsData && paginateFlowRunsData.results.length === 0) {
return {
status: "success" as const,
error: null,
data: {
...paginateFlowRunsData,
results: [] satisfies Array<FlowRunWithFlow>,
},
};
}

if (paginateFlowRunsData && flowMap.size > 0) {
return {
status: "success" as const,
error: null,
data: {
...paginateFlowRunsData,
results: paginateFlowRunsData.results.map((flowRun) => {
const flow = flowMap.get(flowRun.flow_id);
if (!flow) {
throw new Error("Expecting parent flow to be found");
}
return {
...flowRun,
flow,
};
}),
},
};
}

if (paginateFlowRunsError || flowsError) {
return {
status: "error" as const,
error: paginateFlowRunsError || flowsError,
data: undefined,
};
}

return {
status: "pending" as const,
error: null,
data: undefined,
};
};
Loading