diff --git a/airflow/api_fastapi/core_api/app.py b/airflow/api_fastapi/core_api/app.py index fc29e51f999fe..2773c79629154 100644 --- a/airflow/api_fastapi/core_api/app.py +++ b/airflow/api_fastapi/core_api/app.py @@ -71,7 +71,7 @@ def init_views(app: FastAPI) -> None: name="webapp_static_folder", ) - @app.get("/webapp/{rest_of_path:path}", response_class=HTMLResponse, include_in_schema=False) + @app.get("/{rest_of_path:path}", response_class=HTMLResponse, include_in_schema=False) def webapp(request: Request, rest_of_path: str): return templates.TemplateResponse("/index.html", {"request": request}, media_type="text/html") diff --git a/airflow/ui/src/router.tsx b/airflow/ui/src/router.tsx index ae33b021d211d..45b3876467906 100644 --- a/airflow/ui/src/router.tsx +++ b/airflow/ui/src/router.tsx @@ -66,6 +66,6 @@ export const router = createBrowserRouter( }, ], { - basename: "/webapp", + basename: "/", }, ); diff --git a/airflow/ui/vite.config.ts b/airflow/ui/vite.config.ts index 7bc48d640418a..46c929976c1b7 100644 --- a/airflow/ui/vite.config.ts +++ b/airflow/ui/vite.config.ts @@ -28,9 +28,7 @@ export default defineConfig({ { name: "transform-url-src", transformIndexHtml: (html) => - html - .replace(`src="/assets/`, `src="/static/assets/`) - .replace(`href="/`, `href="/webapp/`), + html.replace(`src="/assets/`, `src="/static/assets/`), }, ], resolve: { alias: { openapi: "/openapi-gen", src: "/src" } }, diff --git a/airflow/www/templates/airflow/main.html b/airflow/www/templates/airflow/main.html index 3842d3602dd7a..4e0aa09e628d7 100644 --- a/airflow/www/templates/airflow/main.html +++ b/airflow/www/templates/airflow/main.html @@ -100,7 +100,7 @@ {% if auth_manager.is_logged_in() %} {% call show_message(category='info', dismissible=true) %} We have a new UI for Airflow 3.0 - Check it out now! + Check it out now! {% endcall %} {% endif %} {% endblock %}