From c319f6117ae88a8fa56fe44218bae33e47459d06 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 7 Mar 2024 01:18:17 +0100 Subject: [PATCH] Disable login page errors on the web --- front/apps/web/src/pages/_app.tsx | 12 +++++++++--- front/packages/models/src/query.tsx | 1 + front/packages/ui/src/login/login.tsx | 2 +- front/packages/ui/src/login/register.tsx | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/front/apps/web/src/pages/_app.tsx b/front/apps/web/src/pages/_app.tsx index a388c3d9..a82c952a 100755 --- a/front/apps/web/src/pages/_app.tsx +++ b/front/apps/web/src/pages/_app.tsx @@ -117,10 +117,16 @@ const YoshikiDebug = ({ children }: { children: JSX.Element }) => { return {children}; }; -const ConnectionErrorVerifier = ({ children }: { children: JSX.Element }) => { +const ConnectionErrorVerifier = ({ + children, + skipErrors, +}: { + children: JSX.Element; + skipErrors?: boolean; +}) => { const { error } = useContext(ConnectionErrorContext); - if (!error) return children; + if (!error || skipErrors) return children; return ; }; @@ -158,7 +164,7 @@ const App = ({ Component, pageProps }: AppProps) => { - + = ComponentType< | { Layout: QueryPage<{ page: ReactElement }>; props: object }; requiredPermissions?: string[]; randomItems?: Items[]; + isPublic?: boolean }; export const toQueryKey = (query: { diff --git a/front/packages/ui/src/login/login.tsx b/front/packages/ui/src/login/login.tsx index 4f86c0c0..546151f7 100644 --- a/front/packages/ui/src/login/login.tsx +++ b/front/packages/ui/src/login/login.tsx @@ -96,5 +96,5 @@ export const LoginPage: QueryPage<{ apiUrl?: string; error?: string }> = ({ }; LoginPage.getFetchUrls = () => [OidcLogin.query()]; - +LoginPage.isPublic = true; LoginPage.getLayout = DefaultLayout; diff --git a/front/packages/ui/src/login/register.tsx b/front/packages/ui/src/login/register.tsx index 32fde97f..81af64ee 100644 --- a/front/packages/ui/src/login/register.tsx +++ b/front/packages/ui/src/login/register.tsx @@ -106,5 +106,5 @@ export const RegisterPage: QueryPage<{ apiUrl?: string }> = ({ apiUrl }) => { }; RegisterPage.getFetchUrls = () => [OidcLogin.query()]; - +RegisterPage.isPublic = true; RegisterPage.getLayout = DefaultLayout;