Skip to content

[v3-1-test] Improve 404 handling by adding fallback route for invalid URLs (#58546) #58629

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.

Sign up for GitHub

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

Merged
pierrejeambrun merged 1 commit into from
Nov 25, 2025
Merged

[v3-1-test] Improve 404 handling by adding fallback route for invalid URLs (#58546) #58629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 airflow-core/src/airflow/ui/public/i18n/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"back": "Back",
"defaultMessage": "An unexpected error occurred",
"home": "Home",
"invalidUrl": "Page Not Found. Please check the URL and try again.",
"notFound": "Page Not Found",
"title": "Error"
},
Expand Down
5 changes: 4 additions & 1 deletion airflow-core/src/airflow/ui/src/pages/Error.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ export const ErrorPage = () => {
let errorMessage = translate("error.defaultMessage");
let statusCode = "";

if (isRouteErrorResponse(error)) {
if (error === null || error === undefined) {
statusCode = "404";
errorMessage = translate("error.invalidUrl");
} else if (isRouteErrorResponse(error)) {
statusCode = String(error.status);
errorMessage =
((error as unknown as Error).message || (error as { statusText?: string }).statusText) ??
Expand Down
4 changes: 4 additions & 0 deletions airflow-core/src/airflow/ui/src/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,10 @@ export const routerConfig = [
element: <Task />,
path: "dags/:dagId/tasks/:taskId",
},
{
element: <ErrorPage />,
path: "*",
},
],
element: <BaseLayout />,
errorElement: (
Expand Down