Skip to content

Commit 6dba787

Browse files
committed
Rebase and fix conflicts.
1 parent 577b016 commit 6dba787

File tree

4 files changed

+39
-9
lines changed

4 files changed

+39
-9
lines changed

airflow/ui/pnpm-lock.yaml

Lines changed: 28 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

airflow/ui/src/components/DisplayMarkdownButton.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ const DisplayMarkdownButton = ({
3838

3939
return (
4040
<Box>
41-
<Button data-testid="documentation-button" onClick={() => setIsDocsOpen(true)} variant="outline">
42-
<FiBookOpen height={5} width={5} />
43-
{docType} Docs
41+
<Button data-testid="markdown-button" onClick={() => setIsDocsOpen(true)} variant="outline">
42+
{icon}
43+
{text}
4444
</Button>
4545
<Dialog.Root
46-
data-testid="documentation-modal"
46+
data-testid="markdown-modal"
4747
onOpenChange={() => setIsDocsOpen(false)}
4848
open={isDocsOpen}
4949
size="md"

airflow/ui/src/pages/Dag/Dag.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ describe("Dag Documentation Modal", () => {
3838
it("Display documentation button only when docs_md is present", async () => {
3939
render(<AppWrapper initialEntries={["/dags/tutorial_taskflow_api"]} />);
4040

41-
await waitFor(() => expect(screen.getByTestId("documentation-button")).toBeInTheDocument());
42-
await waitFor(() => screen.getByTestId("documentation-button").click());
41+
await waitFor(() => expect(screen.getByTestId("markdown-button")).toBeInTheDocument());
42+
await waitFor(() => screen.getByTestId("markdown-button").click());
4343
await waitFor(() =>
4444
expect(screen.getByText(/taskflow api tutorial documentation/iu)).toBeInTheDocument(),
4545
);

airflow/ui/src/router.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ export const routerConfig = [
6666
element: <Variables />,
6767
path: "variables",
6868
},
69+
{
70+
element: <Pools />,
71+
path: "pools",
72+
},
6973
{
7074
children: [
7175
{ element: <Overview />, index: true },
@@ -82,6 +86,7 @@ export const routerConfig = [
8286
{ element: <TaskInstances />, index: true },
8387
{ element: <Events />, path: "events" },
8488
{ element: <Code />, path: "code" },
89+
{ element: <DagRunDetails />, path: "details" },
8590
],
8691
element: <Run />,
8792
path: "dags/:dagId/runs/:runId",

0 commit comments

Comments
 (0)