Remove /webapp prefix from new UI (#44227)

apache · Nov 21, 2024 · 82e0157 · 82e0157
1 parent a924284
commit 82e0157
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -100,7 +100,7 @@
   {% if auth_manager.is_logged_in() %}
     {% call show_message(category='info', dismissible=true) %}
       <span>We have a new UI for Airflow 3.0</span>
-      <a href="http://localhost:29091/webapp">Check it out now!</a>
+      <a href="http://localhost:29091/">Check it out now!</a>
     {% endcall %}
   {% endif %}
 {% endblock %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,6 +66,6 @@ export const router = createBrowserRouter( @@
         },
       ],
       {
-        basename: "/webapp",
+        basename: "/",
       },
     );