Display a generic fallback component when initial config load fails

packages/twenty-front/src/modules/activities/blocks/components/FileBlock.tsx

@@ -3,11 +3,12 @@ import styled from '@emotion/styled';
 import { isNonEmptyString } from '@sniptt/guards';
 import { ChangeEvent, useRef } from 'react';
 
-import { AppThemeProvider } from '@/ui/theme/components/AppThemeProvider';
+import { UserThemeProviderEffect } from '@/ui/theme/components/AppThemeProvider';
 import { Button } from 'twenty-ui';
 import { isDefined } from '~/utils/isDefined';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
+import { BaseThemeProvider } from '@/ui/theme/components/BaseThemeProvider';
 import { AttachmentIcon } from '../../files/components/AttachmentIcon';
 import { AttachmentType } from '../../files/types/Attachment';
 import { getFileType } from '../../files/utils/getFileType';
@@ -90,7 +91,8 @@ export const FileBlock = createReactBlockSpec(
 
       if (isNonEmptyString(block.props.url)) {
         return (
-          <AppThemeProvider>
+          <BaseThemeProvider>
+            <UserThemeProviderEffect />
             <StyledFileLine>
               <AttachmentIcon
                 attachmentType={block.props.fileType as AttachmentType}
@@ -99,12 +101,13 @@ export const FileBlock = createReactBlockSpec(
                 {block.props.name}
               </StyledLink>
             </StyledFileLine>
-          </AppThemeProvider>
+          </BaseThemeProvider>
         );
       }
 
       return (
-        <AppThemeProvider>
+        <BaseThemeProvider>
+          <UserThemeProviderEffect />
           <StyledUploadFileContainer>
             <StyledFileInput
               ref={inputFileRef}
@@ -116,7 +119,7 @@ export const FileBlock = createReactBlockSpec(
               title="Upload File"
             ></Button>
           </StyledUploadFileContainer>
-        </AppThemeProvider>
+        </BaseThemeProvider>
       );
     },
   },

packages/twenty-front/src/modules/app/components/AppRouterProviders.tsx

@@ -13,7 +13,8 @@ import { PrefetchDataProvider } from '@/prefetch/components/PrefetchDataProvider
 import { DialogManager } from '@/ui/feedback/dialog-manager/components/DialogManager';
 import { DialogManagerScope } from '@/ui/feedback/dialog-manager/scopes/DialogManagerScope';
 import { SnackBarProvider } from '@/ui/feedback/snack-bar-manager/components/SnackBarProvider';
-import { AppThemeProvider } from '@/ui/theme/components/AppThemeProvider';
+import { UserThemeProviderEffect } from '@/ui/theme/components/AppThemeProvider';
+import { BaseThemeProvider } from '@/ui/theme/components/BaseThemeProvider';
 import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
 import { UserProvider } from '@/users/components/UserProvider';
 import { UserProviderEffect } from '@/users/components/UserProviderEffect';
@@ -27,17 +28,18 @@ export const AppRouterProviders = () => {
 
   return (
     <ApolloProvider>
-      <ClientConfigProviderEffect />
-      <ClientConfigProvider>
-        <ChromeExtensionSidecarEffect />
-        <ChromeExtensionSidecarProvider>
-          <UserProviderEffect />
-          <UserProvider>
-            <AuthProvider>
-              <ApolloMetadataClientProvider>
-                <ObjectMetadataItemsProvider>
-                  <PrefetchDataProvider>
-                    <AppThemeProvider>
+      <BaseThemeProvider>
+        <ClientConfigProviderEffect />
+        <ClientConfigProvider>
+          <ChromeExtensionSidecarEffect />
+          <ChromeExtensionSidecarProvider>
+            <UserProviderEffect />
+            <UserProvider>
+              <AuthProvider>
+                <ApolloMetadataClientProvider>
+                  <ObjectMetadataItemsProvider>
+                    <PrefetchDataProvider>
+                      <UserThemeProviderEffect />
                       <SnackBarProvider>
                         <DialogManagerScope dialogManagerScopeId="dialog-manager">
                           <DialogManager>
@@ -50,15 +52,15 @@ export const AppRouterProviders = () => {
                           </DialogManager>
                         </DialogManagerScope>
                       </SnackBarProvider>
-                    </AppThemeProvider>
-                  </PrefetchDataProvider>
-                  <PageChangeEffect />
-                </ObjectMetadataItemsProvider>
-              </ApolloMetadataClientProvider>
-            </AuthProvider>
-          </UserProvider>
-        </ChromeExtensionSidecarProvider>
-      </ClientConfigProvider>
+                    </PrefetchDataProvider>
+                    <PageChangeEffect />
+                  </ObjectMetadataItemsProvider>
+                </ApolloMetadataClientProvider>
+              </AuthProvider>
+            </UserProvider>
+          </ChromeExtensionSidecarProvider>
+        </ClientConfigProvider>
+      </BaseThemeProvider>
     </ApolloProvider>
   );
 };

packages/twenty-front/src/modules/auth/hooks/useAuth.ts

@@ -17,7 +17,7 @@ import { workspacesState } from '@/auth/states/workspaces';
 import { authProvidersState } from '@/client-config/states/authProvidersState';
 import { billingState } from '@/client-config/states/billingState';
 import { captchaProviderState } from '@/client-config/states/captchaProviderState';
-import { isClientConfigLoadedState } from '@/client-config/states/isClientConfigLoadedState';
+import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
 import { isDebugModeState } from '@/client-config/states/isDebugModeState';
 import { isSignInPrefilledState } from '@/client-config/states/isSignInPrefilledState';
 import { supportChatState } from '@/client-config/states/supportChatState';
@@ -229,8 +229,8 @@ export const useAuth = () => {
         const captchaProvider = snapshot
           .getLoadable(captchaProviderState)
           .getValue();
-        const isClientConfigLoaded = snapshot
-          .getLoadable(isClientConfigLoadedState)
+        const clientConfigApiStatus = snapshot
+          .getLoadable(clientConfigApiStatusState)
           .getValue();
         const isCurrentUserLoaded = snapshot
           .getLoadable(isCurrentUserLoadedState)
@@ -244,7 +244,7 @@ export const useAuth = () => {
           set(supportChatState, supportChat);
           set(isDebugModeState, isDebugMode);
           set(captchaProviderState, captchaProvider);
-          set(isClientConfigLoadedState, isClientConfigLoaded);
+          set(clientConfigApiStatusState, clientConfigApiStatus);
           set(isCurrentUserLoadedState, isCurrentUserLoaded);
           return undefined;
         });

packages/twenty-front/src/modules/client-config/components/ClientConfigProvider.tsx

@@ -1,11 +1,21 @@
 import { useRecoilValue } from 'recoil';
 
-import { isClientConfigLoadedState } from '@/client-config/states/isClientConfigLoadedState';
+import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
+import { ClientConfigError } from '@/error-handler/components/ClientConfigError';
 
 export const ClientConfigProvider: React.FC<React.PropsWithChildren> = ({
   children,
 }) => {
-  const isClientConfigLoaded = useRecoilValue(isClientConfigLoadedState);
+  const { isLoaded, isErrored, error } = useRecoilValue(
+    clientConfigApiStatusState,
+  );
 
-  return isClientConfigLoaded ? <>{children}</> : <></>;
+  // TODO: Implement a better loading strategy
+  if (!isLoaded) return null;
+
+  return isErrored && error instanceof Error ? (
+    <ClientConfigError error={error} />
+  ) : (
+    children
+  );
 };

packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx

@@ -3,8 +3,8 @@ import { authProvidersState } from '@/client-config/states/authProvidersState';
 import { billingState } from '@/client-config/states/billingState';
 import { captchaProviderState } from '@/client-config/states/captchaProviderState';
 import { chromeExtensionIdState } from '@/client-config/states/chromeExtensionIdState';
+import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
 import { isAnalyticsEnabledState } from '@/client-config/states/isAnalyticsEnabledState';
-import { isClientConfigLoadedState } from '@/client-config/states/isClientConfigLoadedState';
 import { isDebugModeState } from '@/client-config/states/isDebugModeState';
 import { isSignInPrefilledState } from '@/client-config/states/isSignInPrefilledState';
 import { isSignUpDisabledState } from '@/client-config/states/isSignUpDisabledState';
@@ -27,8 +27,8 @@ export const ClientConfigProviderEffect = () => {
   const setSupportChat = useSetRecoilState(supportChatState);
 
   const setSentryConfig = useSetRecoilState(sentryConfigState);
-  const [isClientConfigLoaded, setIsClientConfigLoaded] = useRecoilState(
-    isClientConfigLoadedState,
+  const [clientConfigApiStatus, setClientConfigApiStatus] = useRecoilState(
+    clientConfigApiStatusState,
   );
 
   const setCaptchaProvider = useSetRecoilState(captchaProviderState);
@@ -37,42 +37,64 @@ export const ClientConfigProviderEffect = () => {
 
   const setApiConfig = useSetRecoilState(apiConfigState);
 
-  const { data, loading } = useGetClientConfigQuery({
-    skip: isClientConfigLoaded,
+  const { data, loading, error } = useGetClientConfigQuery({
+    skip: clientConfigApiStatus.isLoaded,
   });
 
   useEffect(() => {
-    if (!loading && isDefined(data?.clientConfig)) {
-      setIsClientConfigLoaded(true);
-      setAuthProviders({
-        google: data?.clientConfig.authProviders.google,
-        microsoft: data?.clientConfig.authProviders.microsoft,
-        password: data?.clientConfig.authProviders.password,
-        magicLink: false,
-        sso: data?.clientConfig.authProviders.sso,
-      });
-      setIsDebugMode(data?.clientConfig.debugMode);
-      setIsAnalyticsEnabled(data?.clientConfig.analyticsEnabled);
-      setIsSignInPrefilled(data?.clientConfig.signInPrefilled);
-      setIsSignUpDisabled(data?.clientConfig.signUpDisabled);
-
-      setBilling(data?.clientConfig.billing);
-      setSupportChat(data?.clientConfig.support);
-
-      setSentryConfig({
-        dsn: data?.clientConfig?.sentry?.dsn,
-        release: data?.clientConfig?.sentry?.release,
-        environment: data?.clientConfig?.sentry?.environment,
-      });
-
-      setCaptchaProvider({
-        provider: data?.clientConfig?.captcha?.provider,
-        siteKey: data?.clientConfig?.captcha?.siteKey,
-      });
-
-      setChromeExtensionId(data?.clientConfig?.chromeExtensionId);
-      setApiConfig(data?.clientConfig?.api);
+    if (loading) return;
+    setClientConfigApiStatus((currentStatus) => ({
+      ...currentStatus,
+      isLoaded: true,
+    }));
+
+    if (error instanceof Error) {
+      setClientConfigApiStatus((currentStatus) => ({
+        ...currentStatus,
+        isErrored: true,
+        error,
+      }));
+      return;
+    }
+
+    if (!isDefined(data?.clientConfig)) {
+      return;
     }
+
+    setClientConfigApiStatus((currentStatus) => ({
+      ...currentStatus,
+      isErrored: false,
+      error: undefined,
+    }));
+
+    setAuthProviders({
+      google: data?.clientConfig.authProviders.google,
+      microsoft: data?.clientConfig.authProviders.microsoft,
+      password: data?.clientConfig.authProviders.password,
+      magicLink: false,
+      sso: data?.clientConfig.authProviders.sso,
+    });
+    setIsDebugMode(data?.clientConfig.debugMode);
+    setIsAnalyticsEnabled(data?.clientConfig.analyticsEnabled);
+    setIsSignInPrefilled(data?.clientConfig.signInPrefilled);
+    setIsSignUpDisabled(data?.clientConfig.signUpDisabled);
+
+    setBilling(data?.clientConfig.billing);
+    setSupportChat(data?.clientConfig.support);
+
+    setSentryConfig({
+      dsn: data?.clientConfig?.sentry?.dsn,
+      release: data?.clientConfig?.sentry?.release,
+      environment: data?.clientConfig?.sentry?.environment,
+    });
+
+    setCaptchaProvider({
+      provider: data?.clientConfig?.captcha?.provider,
+      siteKey: data?.clientConfig?.captcha?.siteKey,
+    });
+
+    setChromeExtensionId(data?.clientConfig?.chromeExtensionId);
+    setApiConfig(data?.clientConfig?.api);
   }, [
     data,
     setAuthProviders,
@@ -83,11 +105,12 @@ export const ClientConfigProviderEffect = () => {
     setBilling,
     setSentryConfig,
     loading,
-    setIsClientConfigLoaded,
+    setClientConfigApiStatus,
     setCaptchaProvider,
     setChromeExtensionId,
     setApiConfig,
     setIsAnalyticsEnabled,
+    error,
   ]);
 
   return <></>;

packages/twenty-front/src/modules/client-config/states/clientConfigApiStatusState.ts

@@ -0,0 +1,12 @@
+import { createState } from 'twenty-ui';
+
+type ClientConfigApiStatus = {
+  isLoaded: boolean;
+  isErrored: boolean;
+  error?: Error;
+};
+
+export const clientConfigApiStatusState = createState<ClientConfigApiStatus>({
+  key: 'clientConfigApiStatus',
+  defaultValue: { isLoaded: false, isErrored: false, error: undefined },
+});

packages/twenty-front/src/modules/error-handler/components/AppErrorBoundary.tsx

@@ -12,10 +12,16 @@ export const AppErrorBoundary = ({ children }: { children: ReactNode }) => {
     });
   };
 
+  // TODO: Implement a better reset strategy, hard reload for now
+  const handleReset = () => {
+    window.location.reload();
+  };
+
   return (
     <ErrorBoundary
       FallbackComponent={GenericErrorFallback}
       onError={handleError}
+      onReset={handleReset}
     >
       {children}
     </ErrorBoundary>

packages/twenty-front/src/modules/error-handler/components/ClientConfigError.tsx

@@ -0,0 +1,41 @@
+import styled from '@emotion/styled';
+import { MOBILE_VIEWPORT } from 'twenty-ui';
+import { GenericErrorFallback } from './GenericErrorFallback';
+
+const StyledContainer = styled.div`
+  background: ${({ theme }) => theme.background.noisy};
+  box-sizing: border-box;
+  display: flex;
+  height: 100dvh;
+  width: 100%;
+  padding-top: ${({ theme }) => theme.spacing(3)};
+  padding-left: ${({ theme }) => theme.spacing(3)};
+  padding-bottom: 0;
+
+  @media (max-width: ${MOBILE_VIEWPORT}px) {
+    padding-left: 0;
+    padding-bottom: ${({ theme }) => theme.spacing(3)};
+  }
+`;
+
+type ClientConfigErrorProps = {
+  error: Error;
+};
+
+export const ClientConfigError = ({ error }: ClientConfigErrorProps) => {
+  // TODO: Implement a better loading strategy
+  const handleReset = () => {
+    window.location.reload();
+  };
+
+  return (
+    <StyledContainer>
+      <GenericErrorFallback
+        error={error}
+        resetErrorBoundary={handleReset}
+        title="Unable to Reach Back-end"
+        hidePageHeader
+      />
+    </StyledContainer>
+  );
+};