Skip to content

Spinner instad or error message when authentication flow waits #58037

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

Closed
anjo0511 wants to merge 6 commits into from
Closed

Spinner instad or error message when authentication flow waits #58037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
89d0c2f
Authentication spinner #57981
Nov 7, 2025
9c3cd67
i18n: add error.authenticating translations to locales and use in Err…
Nov 17, 2025
1fc771f
Merge branch 'main' into auth-spinner-57981
anjo0511 Nov 17, 2025
84396ff
Merge branch 'main' into auth-spinner-57981
anjo0511 Nov 21, 2025
31ddfe8
revert translations all but english
Nov 21, 2025
7007c08
Merge branch 'main' into auth-spinner-57981
anjo0511 Nov 25, 2025
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
3 changes: 2 additions & 1 deletion 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 @@ -92,7 +92,8 @@
"home": "Home",
"invalidUrl": "Page Not Found. Please check the URL and try again.",
"notFound": "Page Not Found",
"title": "Error"
"title": "Error",
"authenticating": "Authenticating..."
},
"expand": {
"collapse": "Collapse",
Expand Down
25 changes: 23 additions & 2 deletions 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 @@ -16,19 +16,40 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Box, VStack, Heading, Text, Button, Container, HStack, Code } from "@chakra-ui/react";
import { Box, VStack, Heading, Text, Button, Container, HStack, Code, Spinner } from "@chakra-ui/react";
import { useTranslation } from "react-i18next";
import { useNavigate, useRouteError, isRouteErrorResponse } from "react-router-dom";
import { useNavigate, useRouteError, isRouteErrorResponse, useLocation } from "react-router-dom";

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

export const ErrorPage = () => {
const navigate = useNavigate();
const error = useRouteError();
const location = useLocation();
const { t: translate } = useTranslation();

let errorMessage = translate("error.defaultMessage");
let statusCode = "";

// Check if we're in the OAuth flow
const isInAuthFlow = location.pathname.includes('oauth') ||
location.pathname.includes('login') ||
(error && typeof error === 'object' && 'status' in error && error.status === 401);

// If we're in the auth flow, don't show the error page
if (isInAuthFlow) {
return (
<Box alignItems="center" display="flex" justifyContent="center" pt={36} px={4}>
<Container maxW="lg">
<VStack gap={8} textAlign="center">
<AirflowPin height="50px" width="50px" />
<Spinner size="xl" color="blue.500" />
<Text>{translate("error.authenticating")}</Text>
</VStack>
</Container>
</Box>
);
}

if (error === null || error === undefined) {
statusCode = "404";
Expand Down
Loading