put back workspacelogs

gitpod-io · Jun 19, 2022 · 8386a8f · 8386a8f
1 parent 4666613
commit 8386a8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/components/dashboard/src/components/PrebuildLogs.tsx b/components/dashboard/src/components/PrebuildLogs.tsx
@@ -27,7 +27,7 @@ export default function PrebuildLogs(props: PrebuildLogsProps) {
     const [workspace, setWorkspace] = useState<Workspace | undefined>();
     const [workspaceInstance, setWorkspaceInstance] = useState<WorkspaceInstance | undefined>();
     const [error, setError] = useState<Error | undefined>();
-    const [logsEmitter, setLogsEmitter] = useState(new EventEmitter());
+    const [logsEmitter] = useState(new EventEmitter());
 
     useEffect(() => {
         const disposables = new DisposableCollection();
@@ -36,9 +36,6 @@ export default function PrebuildLogs(props: PrebuildLogsProps) {
             if (!props.workspaceId) {
                 return;
             }
-            if (props.logsEmitter) {
-                setLogsEmitter(props.logsEmitter);
-            }
             try {
                 const info = await getGitpodService().server.getWorkspace(props.workspaceId);
                 if (info.latestInstance) {

diff --git a/components/dashboard/src/projects/Prebuilds.tsx b/components/dashboard/src/projects/Prebuilds.tsx
@@ -365,6 +365,7 @@ function PrebuildStatusDescription(props: { prebuild: PrebuildWithStatus }) {
 }
 
 export function PrebuildStatus(props: { prebuild: PrebuildWithStatus }) {
+    console.log("prebuild status: ", props.prebuild.status);
     const prebuild = props.prebuild;
 
     return (

diff --git a/components/dashboard/src/start/CreateWorkspace.tsx b/components/dashboard/src/start/CreateWorkspace.tsx
@@ -22,12 +22,14 @@ import StartWorkspace, { parseProps } from "./StartWorkspace";
 import { openAuthorizeWindow } from "../provider-utils";
 import { SelectAccountPayload } from "@gitpod/gitpod-protocol/lib/auth";
 import { SelectAccountModal } from "../settings/SelectAccountModal";
-import PrebuildLogs, { watchHeadlessLogs } from "../components/PrebuildLogs";
+import { watchHeadlessLogs } from "../components/PrebuildLogs";
 import CodeText from "../components/CodeText";
 import FeedbackComponent from "../feedback-form/FeedbackComponent";
 import { isGitpodIo } from "../utils";
 import { PrebuildStatus } from "../projects/Prebuilds";
 
+const WorkspaceLogs = React.lazy(() => import("../components/WorkspaceLogs"));
+
 export interface CreateWorkspaceProps {
     contextUrl: string;
 }
@@ -246,6 +248,7 @@ export default class CreateWorkspace extends React.Component<CreateWorkspaceProp
                 </Modal>
             );
         } else if (result?.runningWorkspacePrebuild) {
+            console.log("we have a running prebuild");
             return (
                 <RunningPrebuildView
                     runningPrebuild={result.runningWorkspacePrebuild}
@@ -487,6 +490,7 @@ function RunningPrebuildView(props: RunningPrebuildViewProps) {
                     }
 
                     setPrebuild(prebuild);
+                    console.log("we have prebuild? ", prebuild);
                 },
             }),
         );
@@ -499,7 +503,7 @@ function RunningPrebuildView(props: RunningPrebuildViewProps) {
     return (
         <StartPage title="Prebuild in Progress">
             <Suspense fallback={<div />}>
-                <PrebuildLogs logsEmitter={logsEmitter} workspaceId={props.runningPrebuild.workspaceID} />
+                <WorkspaceLogs logsEmitter={logsEmitter} />
                 {prebuild && <PrebuildStatus prebuild={prebuild} />}
             </Suspense>
             <button