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

Add Docs button to Nav #42586

Merged
merged 5 commits into from
Oct 1, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ celerybeat-schedule

# dotenv
.env
.env.local
.autoenv*.zsh

# virtualenv
Expand Down
23 changes: 23 additions & 0 deletions airflow/ui/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#/


# This is an example. You should make your own `.env.local` file for development

VITE_FASTAPI_URL="http://localhost:29091"
67 changes: 67 additions & 0 deletions airflow/ui/src/layouts/Nav/DocsButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import {
IconButton,
Link,
Menu,
MenuButton,
MenuItem,
MenuList,
} from "@chakra-ui/react";
import { FiBookOpen } from "react-icons/fi";

import { navButtonProps } from "./navButtonProps";

const links = [
{
href: "https://airflow.apache.org/docs/",
title: "Documentation",
},
{
href: "https://github.com/apache/airflow",
title: "GitHub Repo",
},
{
href: `${import.meta.env.VITE_FASTAPI_URL}/docs`,
title: "REST API Reference",
},
];

export const DocsButton = () => (
<Menu placement="right">
<MenuButton
as={IconButton}
icon={<FiBookOpen size="1.75rem" />}
{...navButtonProps}
/>
<MenuList>
{links.map((link) => (
<MenuItem
aria-label={link.title}
as={Link}
href={link.href}
key={link.title}
target="_blank"
>
{link.title}
</MenuItem>
))}
</MenuList>
</Menu>
);
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ import {
FiSun,
} from "react-icons/fi";

import { AirflowPin } from "../assets/AirflowPin";
import { DagIcon } from "../assets/DagIcon";
import { AirflowPin } from "src/assets/AirflowPin";
import { DagIcon } from "src/assets/DagIcon";

import { DocsButton } from "./DocsButton";
import { NavButton } from "./NavButton";

export const Nav = () => {
Expand Down Expand Up @@ -78,7 +80,7 @@ export const Nav = () => {
<NavButton
icon={<FiDatabase size="1.75rem" />}
isDisabled
title="Datasets"
title="Assets"
/>
<NavButton
icon={<FiBarChart2 size="1.75rem" />}
Expand All @@ -103,6 +105,7 @@ export const Nav = () => {
icon={<FiCornerUpLeft size="1.5rem" />}
title="Return to legacy UI"
/>
<DocsButton />
<NavButton
icon={
colorMode === "light" ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,18 @@ import { Box, Button, type ButtonProps } from "@chakra-ui/react";
import type { ReactElement } from "react";
import { Link as RouterLink } from "react-router-dom";

import { navButtonProps } from "./navButtonProps";

type NavButtonProps = {
readonly href?: string;
readonly icon: ReactElement;
readonly target?: string;
readonly title?: string;
readonly to?: string;
} & ButtonProps;

export const NavButton = ({ icon, title, to, ...rest }: NavButtonProps) => (
<Button
alignItems="center"
as={RouterLink}
borderRadius="none"
flexDir="column"
height={16}
to={to}
transition="0.2s background-color ease-in-out"
variant="ghost"
whiteSpace="wrap"
width={24}
{...rest}
>
<Button as={RouterLink} to={to} {...navButtonProps} {...rest}>
<Box alignSelf="center">{icon}</Box>
<Box fontSize="xs">{title}</Box>
</Button>
Expand Down
20 changes: 20 additions & 0 deletions airflow/ui/src/layouts/Nav/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

export { Nav } from "./Nav";
30 changes: 30 additions & 0 deletions airflow/ui/src/layouts/Nav/navButtonProps.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import type { ButtonProps } from "@chakra-ui/react";

export const navButtonProps: ButtonProps = {
alignItems: "center",
borderRadius: "none",
flexDir: "column",
height: 16,
transition: "0.2s background-color ease-in-out",
variant: "ghost",
whiteSpace: "wrap",
width: 24,
};
2 changes: 1 addition & 1 deletion airflow/ui/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const queryClient = new QueryClient({
},
});

axios.defaults.baseURL = "http://localhost:29091";
axios.defaults.baseURL = import.meta.env.VITE_FASTAPI_URL;

// redirect to login page if the API responds with unauthorized or forbidden errors
axios.interceptors.response.use(
Expand Down
9 changes: 9 additions & 0 deletions airflow/ui/src/vite-env.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/consistent-type-definitions */
/*!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Expand All @@ -18,3 +19,11 @@
*/

/// <reference types="vite/client" />

interface ImportMetaEnv {
readonly VITE_FASTAPI_URL: string;
}

interface ImportMeta {
readonly env: ImportMetaEnv;
}
17 changes: 17 additions & 0 deletions contributing-docs/14_node_environment_setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,23 @@ Project Structure
- ``/src/components`` shared components across the UI
- ``/dist`` build files

Local Environment Variables
---------------------------

Copy the example environment

.. code-block:: bash

cp .env.example .env.local

If you run into CORS issues, you may need to add some variables to your Breeze config, ``files/airflow-breeze-config/variables.env``:

.. code-block:: bash

export AIRFLOW__API__ACCESS_CONTROL_ALLOW_HEADERS="Origin, Access-Control-Request-Method"
export AIRFLOW__API__ACCESS_CONTROL_ALLOW_METHODS="*"
export AIRFLOW__API__ACCESS_CONTROL_ALLOW_ORIGINS="http://localhost:28080,http://localhost:8080"



DEPRECATED Airflow WWW
Expand Down