refactor: 💡 handle edge case

chauduong1192 · Dec 6, 2024 · 5f521fe · 5f521fe · vercel · Dec 6, 2024
1 parent 1613f22
commit 5f521fe
Show file tree

Hide file tree

Showing 13 changed files with 849 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.2",
     "@radix-ui/react-slot": "^1.1.0",
+    "@radix-ui/react-toast": "^1.2.2",
     "@tanstack/react-query": "^5.61.5",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/api/[...route]/github.ts b/src/app/api/[...route]/github.ts
@@ -5,7 +5,7 @@ import { StatusCodes } from 'http-status-codes';
 import { Env } from '@/app/api/configs/env';
 import { formatResponse } from '@/app/api/helpers/response';
 
-import { GithubCommit } from '@/types';
+import { GithubBranch, GithubCommit } from '@/types';
 
 const { GITHUB_URL, GITHUB_USERNAME, GITHUB_TOKEN, GENIMI_API_KEY } = Env;
 const genAI = new GoogleGenerativeAI(GENIMI_API_KEY as string);
@@ -54,8 +54,16 @@ const githubApi = new Hono()
         },
       );
       const newResponse = await response.json();
+      const formatRes = newResponse.filter((branch: GithubBranch) =>
+        branch.name.startsWith('chaud/'),
+      );
+      if (formatRes.length === 0) {
+        throw new Error(
+          'No branches found. Please try again with different repo.',
+        );
+      }
       return formatResponse(c, StatusCodes.OK, {
-        data: newResponse,
+        data: formatRes,
       });
     } catch (error) {
       throw error;

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -8,6 +8,7 @@ import '@/styles/mdx.css';
 import { CoreLayout } from '@/components/CoreLayout';
 
 import Providers from '@/app/providers';
+import { Toaster } from '@/components/ui/toaster';
 import { siteConfig } from '@/constant/config';
 
 const robotoMono = localFont({
@@ -99,6 +100,7 @@ export default function RootLayout({
       className={`${robotoMono.variable} ${rubik.variable}`}
     >
       <body>
+        <Toaster />
         <Providers>
           <CoreLayout>{children}</CoreLayout>
         </Providers>

diff --git a/src/app/providers.tsx b/src/app/providers.tsx
@@ -1,15 +1,30 @@
 'use client';
 
-import { QueryClientProvider } from '@tanstack/react-query';
+import { QueryCache, QueryClientProvider } from '@tanstack/react-query';
 
+import { useToast } from '@/hooks/use-toast';
 import { getQueryClient } from '@/lib/react-query/query-client';
 
 export default function Providers({ children }: { children: React.ReactNode }) {
   // NOTE: Avoid useState when initializing the query client if you don't
   //       have a suspense boundary between this and the code that may
   //       suspend because React will throw away the client on the initial
   //       render if it suspends and there is no boundary
-  const queryClient = getQueryClient();
+
+  const { toast } = useToast();
+
+  const queryClient = getQueryClient({
+    queryCache: new QueryCache({
+      onError: (error) => {
+        // eslint-disable-next-line no-console
+        console.error(error);
+        toast({
+          description: error.message,
+          variant: 'error',
+        });
+      },
+    }),
+  });
 
   return (
     <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>

diff --git a/src/app/shorts/page.tsx b/src/app/shorts/page.tsx
@@ -16,9 +16,9 @@ export default async function ShortsPage() {
   return (
     <Container subTitle='Showcase of my shorts'>
       <HeadingSection
-        headingText='Github repositories'
-        title='My open-source projects'
-        description="Here's a list of my open-source projects hosted on GitHub."
+        headingText='Welcome to my shorts'
+        title='Shorts'
+        description="Here's a collection of my shorts. Shorts are small projects that I've worked on."
         withHr={true}
         className='gap-0'
       >

diff --git a/src/components/GenerateDaily/GenerateDaily.tsx b/src/components/GenerateDaily/GenerateDaily.tsx
@@ -40,25 +40,22 @@ export const GenerateDaily = ({ repos }: GenerateDailyProps) => {
   const [isVerified, setVerified] = useState<boolean>(false);
 
   const { data: branchesQuery, isLoading: branchesLoading } = useQuery({
-    queryKey: ['branches', repoSelected],
+    queryKey: ['get-branches', repoSelected],
     queryFn: () => getBranches(repoSelected),
     enabled: !!repoSelected,
+    retry: false,
   });
 
   const { data: commitsQuery, isLoading: commitsLoading } = useQuery({
-    queryKey: [
-      'commits',
-      dateSelected?.toISOString(),
-      repoSelected,
-      branchSelected,
-    ],
+    queryKey: ['get-commits', branchSelected, dateSelected?.toISOString()],
     queryFn: async () =>
       getCommitsByBranch({
         full_name: repoSelected,
         sha: branchSelected,
         until: dateSelected?.toISOString() ?? '',
       }),
-    enabled: !!branchSelected,
+    enabled: !!repoSelected && !!branchSelected && !!dateSelected,
+    retry: false,
   });
 
   const [copy] = useCopyToClipboard();