Refactor: move getWorkflowLog logic from log-view to pull-request

m2rads · Oct 17, 2024 · 1b1661a · 1b1661a
1 parent 8f6fac0
commit 1b1661a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/app/(dashboard)/dashboard/log-view.tsx b/app/(dashboard)/dashboard/log-view.tsx
@@ -2,24 +2,14 @@
 
 import { useRef, useMemo, useState } from 'react'
 import { Loader2, ChevronRight, ChevronDown } from 'lucide-react'
-import { getWorkflowLogs } from '@/lib/github'
-import useSWR from 'swr'
-import { LogViewProps, LogGroup } from './types'
+import { LogGroup, LogViewProps } from './types'
 
 
-export function LogView({ owner, repo, runId }: LogViewProps) {
+
+export function LogView({ logs, error, isLoading }: LogViewProps) {
   const logContainerRef = useRef<HTMLDivElement>(null)
   const [expandedGroups, setExpandedGroups] = useState<Record<string, boolean>>({})
 
-  const { data: logs, error, isLoading } = useSWR(
-    runId ? ['workflowLogs', owner, repo, runId] : null,
-    () => getWorkflowLogs(owner, repo, runId!),
-    {
-      revalidateOnFocus: false,
-      revalidateOnReconnect: false,
-    }
-  )
-
   const parsedLogs = useMemo(() => {
     if (!logs) return [];
 

diff --git a/app/(dashboard)/dashboard/pull-request.tsx b/app/(dashboard)/dashboard/pull-request.tsx
@@ -28,7 +28,8 @@ import {
   getPullRequestInfo,
   getFailingTests,
   getLatestRunId,
-  fetchBuildStatus
+  fetchBuildStatus,
+  getWorkflowLogs
 } from "@/lib/github";
 import { LogView } from "./log-view";
 import { PullRequest, TestFile } from "./types";
@@ -84,6 +85,17 @@ export function PullRequestItem({
       )
   );
 
+  const { data: logs, error: logsError } = useSWR(
+    showLogs && latestRunId
+      ? ['workflowLogs', pullRequest.repository.owner.login, pullRequest.repository.name, latestRunId]
+      : null,
+    () => getWorkflowLogs(pullRequest.repository.owner.login, pullRequest.repository.name, latestRunId!),
+    {
+      revalidateOnFocus: false,
+      revalidateOnReconnect: false,
+    }
+  );
+
   const [testFiles, setTestFiles] = useState<TestFile[]>([]);
   const [oldTestFiles, setOldTestFiles] = useState<TestFile[]>([]);
   const [selectedFiles, setSelectedFiles] = useState<Record<string, boolean>>(
@@ -476,9 +488,9 @@ export function PullRequestItem({
       {showLogs && latestRunId && (
         <div className="mt-4">
           <LogView
-            owner={pullRequest.repository.owner.login}
-            repo={pullRequest.repository.name}
-            runId={latestRunId}
+            logs={logs}
+            error={logsError}
+            isLoading={!logs && !logsError}
           />
         </div>
       )}

diff --git a/app/(dashboard)/dashboard/types.ts b/app/(dashboard)/dashboard/types.ts
@@ -29,11 +29,10 @@ export type CommitChangesToPullRequest = (
   commitMessage: string
 ) => Promise<string>;
 
-
 export interface LogViewProps {
-  owner: string;
-  repo: string;
-  runId: string | null;
+  logs: string | undefined;
+  error: Error | undefined;
+  isLoading: boolean;
 }
 
 export interface LogGroup {