From 98ef0b44ecd6a2e8ac44aade0061379f543671b8 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Wed, 4 Jan 2023 22:38:27 -0800
Subject: [PATCH] Add error boundaries to individual routes

---
 .../components/error-fallback.tsx             | 24 +++++++++++++++----
 src/renderer/router/app-router.tsx            | 10 ++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/renderer/features/action-required/components/error-fallback.tsx b/src/renderer/features/action-required/components/error-fallback.tsx
index 1bdbee04..4f01fd99 100644
--- a/src/renderer/features/action-required/components/error-fallback.tsx
+++ b/src/renderer/features/action-required/components/error-fallback.tsx
@@ -1,15 +1,18 @@
 import { Box, Center, Divider, Group, Stack } from '@mantine/core';
 import type { FallbackProps } from 'react-error-boundary';
-import { RiErrorWarningLine, RiArrowLeftLine } from 'react-icons/ri';
+import { RiErrorWarningLine, RiHomeFill, RiArrowLeftSLine } from 'react-icons/ri';
 import { useNavigate, useRouteError } from 'react-router';
 import styled from 'styled-components';
 import { Button, Text } from '/@/renderer/components';
+import { AppRoute } from '/@/renderer/router/routes';
 
 const Container = styled(Box)`
   background: var(--main-bg);
 `;
 
-export const ErrorFallback = ({ error, resetErrorBoundary }: FallbackProps) => {
+export const ErrorFallback = ({ resetErrorBoundary }: FallbackProps) => {
+  const error = useRouteError() as any;
+
   return (
     <Container>
       <Center sx={{ height: '100vh' }}>
@@ -47,11 +50,22 @@ export const RouteErrorBoundary = () => {
     navigate(-1);
   };
 
+  const handleHome = () => {
+    navigate(AppRoute.HOME);
+  };
+
   return (
     <Container>
       <Center sx={{ height: '100vh' }}>
         <Stack sx={{ maxWidth: '50%' }}>
           <Group>
+            <Button
+              px={10}
+              variant="subtle"
+              onClick={handleReturn}
+            >
+              <RiArrowLeftSLine size={20} />
+            </Button>
             <RiErrorWarningLine
               color="var(--danger-color)"
               size={30}
@@ -62,12 +76,12 @@ export const RouteErrorBoundary = () => {
           <Text size="sm">{error?.message}</Text>
           <Group grow>
             <Button
-              leftIcon={<RiArrowLeftLine />}
+              leftIcon={<RiHomeFill />}
               sx={{ flex: 0.5 }}
               variant="default"
-              onClick={handleReturn}
+              onClick={handleHome}
             >
-              Go back
+              Go home
             </Button>
             <Button
               variant="filled"
diff --git a/src/renderer/router/app-router.tsx b/src/renderer/router/app-router.tsx
index 889ae7ac..f37d8fdd 100644
--- a/src/renderer/router/app-router.tsx
+++ b/src/renderer/router/app-router.tsx
@@ -55,41 +55,51 @@ export const AppRouter = () => {
               <Route
                 index
                 element={<HomeRoute />}
+                errorElement={<RouteErrorBoundary />}
               />
               <Route
                 element={<HomeRoute />}
+                errorElement={<RouteErrorBoundary />}
                 path={AppRoute.HOME}
               />
               <Route
                 element={<NowPlayingRoute />}
+                errorElement={<RouteErrorBoundary />}
                 path={AppRoute.NOW_PLAYING}
               />
               <Route
                 element={<AlbumListRoute />}
+                errorElement={<RouteErrorBoundary />}
                 path={AppRoute.LIBRARY_ALBUMS}
               />
               <Route
                 element={<AlbumDetailRoute />}
+                errorElement={<RouteErrorBoundary />}
                 path={AppRoute.LIBRARY_ALBUMS_DETAIL}
               />
               <Route
                 element={<SongListRoute />}
+                errorElement={<RouteErrorBoundary />}
                 path={AppRoute.LIBRARY_SONGS}
               />
               <Route
                 element={<PlaylistListRoute />}
+                errorElement={<RouteErrorBoundary />}
                 path={AppRoute.PLAYLISTS}
               />
               <Route
                 element={<PlaylistDetailRoute />}
+                errorElement={<RouteErrorBoundary />}
                 path={AppRoute.PLAYLISTS_DETAIL}
               />
               <Route
                 element={<PlaylistDetailSongListRoute />}
+                errorElement={<RouteErrorBoundary />}
                 path={AppRoute.PLAYLISTS_DETAIL_SONGS}
               />
               <Route
                 element={<AlbumArtistListRoute />}
+                errorElement={<RouteErrorBoundary />}
                 path={AppRoute.LIBRARY_ALBUMARTISTS}
               />
               <Route