feat(site): display builds logs by default

BrunoQuaresma · BrunoQuaresma · commit 68c7b3f3dbdd · 2024-01-12T19:15:14.000Z
diff --git a/site/src/hooks/useWorkspaceBuildLogs.ts b/site/src/hooks/useWorkspaceBuildLogs.ts
@@ -3,11 +3,14 @@ import { ProvisionerJobLog } from "api/typesGenerated";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { useState, useEffect } from "react";
 
-// buildId is optional because sometimes the build is not loaded yet
-export const useWorkspaceBuildLogs = (buildId?: string) => {
+export const useWorkspaceBuildLogs = (
+  // buildId is optional because sometimes the build is not loaded yet
+  buildId: string | undefined,
+  enabled: boolean = true,
+) => {
   const [logs, setLogs] = useState<ProvisionerJobLog[]>();
   useEffect(() => {
-    if (!buildId) {
+    if (!buildId || !enabled) {
       return;
     }
 
diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -5,7 +5,6 @@ import { Helmet } from "react-helmet-async";
 import { useNavigate } from "react-router-dom";
 import { Workspace } from "./Workspace";
 import { pageTitle } from "utils/page";
-import { hasJobError } from "utils/workspace";
 import { UpdateBuildParametersDialog } from "./UpdateBuildParametersDialog";
 import { ChangeVersionDialog } from "./ChangeVersionDialog";
 import { useMutation, useQuery, useQueryClient } from "react-query";
@@ -67,12 +66,11 @@ export const WorkspaceReadyPage = ({
   });
 
   // Build logs
-  const buildLogs = useWorkspaceBuildLogs(workspace.latest_build.id);
-  const shouldDisplayBuildLogs =
-    hasJobError(workspace) ||
-    ["canceling", "deleting", "pending", "starting", "stopping"].includes(
-      workspace.latest_build.status,
-    );
+  const shouldDisplayBuildLogs = workspace.latest_build.status !== "running";
+  const buildLogs = useWorkspaceBuildLogs(
+    workspace.latest_build.id,
+    shouldDisplayBuildLogs,
+  );
 
   // Restart
   const [confirmingRestart, setConfirmingRestart] = useState<{
