fix

components/dashboard/src/components/PrebuildLogs.tsx

@@ -22,8 +22,10 @@ const WorkspaceLogs = React.lazy(() => import("./WorkspaceLogs"));
 
 export interface PrebuildLogsProps {
     workspaceId: string | undefined;
+    prebuildId?: string | undefined;
     logsEmitter?: EventEmitter;
     onIgnorePrebuild?: () => void;
+    children?: React.ReactNode;
 }
 
 export default function PrebuildLogs(props: PrebuildLogsProps) {
@@ -46,6 +48,10 @@ export default function PrebuildLogs(props: PrebuildLogsProps) {
                     setWorkspace(info.workspace);
                     setWorkspaceInstance(info.latestInstance);
                 }
+                if (props.prebuildId) {
+                    const foundPrebuild = await getGitpodService().server.getPrebuild(props.prebuildId);
+                    setPrebuild(foundPrebuild);
+                }
                 disposables.push(
                     getGitpodService().registerClient({
                         onInstanceUpdate: (instance) => {
@@ -105,11 +111,10 @@ export default function PrebuildLogs(props: PrebuildLogsProps) {
             <Suspense fallback={<div />}>
                 <WorkspaceLogs logsEmitter={logsEmitter} errorMessage={error?.message} />
             </Suspense>
-            <div className="flex gap-x-8 mt-4 mb-8">
+            <div className="h-20 px-6 border-t border-gray-200 dark:border-gray-600 flex space-x-2">
                 {prebuild && <PrebuildStatus prebuild={prebuild} />}
-                <button className="secondary" onClick={() => props.onIgnorePrebuild && props.onIgnorePrebuild()}>
-                    Skip Prebuild
-                </button>
+                <div className="flex-grow" />
+                {props.children}
             </div>
         </>
     );

components/dashboard/src/projects/Prebuild.tsx

@@ -13,7 +13,6 @@ import PrebuildLogs from "../components/PrebuildLogs";
 import Spinner from "../icons/Spinner.svg";
 import { getGitpodService, gitpodHostUrl } from "../service/service";
 import { TeamsContext, getCurrentTeam } from "../teams/teams-context";
-import { PrebuildStatus } from "./Prebuilds";
 import { shortCommitMessage } from "./render-utils";
 
 export default function () {
@@ -157,12 +156,7 @@ export default function () {
             <Header title={renderTitle()} subtitle={renderSubtitle()} />
             <div className="app-container mt-8">
                 <div className="rounded-xl overflow-hidden bg-gray-100 dark:bg-gray-800 flex flex-col">
-                    <div className="h-96 flex">
-                        <PrebuildLogs workspaceId={prebuild?.info?.buildWorkspaceId} />
-                    </div>
-                    <div className="h-20 px-6 bg-gray-50 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-600 flex space-x-2">
-                        {prebuild && <PrebuildStatus prebuild={prebuild} />}
-                        <div className="flex-grow" />
+                    <PrebuildLogs workspaceId={prebuild?.info?.buildWorkspaceId} prebuildId={prebuild?.info?.id}>
                         {["aborted", "timeout", "failed"].includes(prebuild?.status || "") || !!prebuild?.error ? (
                             <button
                                 className="flex items-center space-x-2"
@@ -195,7 +189,7 @@ export default function () {
                         ) : (
                             <button disabled={true}>New Workspace ({prebuild?.info.branch})</button>
                         )}
-                    </div>
+                    </PrebuildLogs>
                 </div>
             </div>
         </>

components/dashboard/src/start/CreateWorkspace.tsx

@@ -488,7 +488,15 @@ function RunningPrebuildView(props: RunningPrebuildViewProps) {
 
     return (
         <StartPage title="Prebuild in Progress">
-            <PrebuildLogs workspaceId={props.runningPrebuild.workspaceID} onIgnorePrebuild={props.onIgnorePrebuild} />
+            <PrebuildLogs
+                workspaceId={props.runningPrebuild.workspaceID}
+                onIgnorePrebuild={props.onIgnorePrebuild}
+                prebuildId={props.runningPrebuild.prebuildID}
+            >
+                <button className="secondary" onClick={() => props.onIgnorePrebuild && props.onIgnorePrebuild()}>
+                    Skip Prebuild
+                </button>
+            </PrebuildLogs>
         </StartPage>
     );
 }

components/dashboard/src/start/StartWorkspace.tsx

@@ -24,12 +24,12 @@ import { v4 } from "uuid";
 import Arrow from "../components/Arrow";
 import ContextMenu from "../components/ContextMenu";
 import PendingChangesDropdown from "../components/PendingChangesDropdown";
-import { watchHeadlessLogs } from "../components/PrebuildLogs";
+import PrebuildLogs, { watchHeadlessLogs } from "../components/PrebuildLogs";
 import { getGitpodService, gitpodHostUrl } from "../service/service";
 import { StartPage, StartPhase, StartWorkspaceError } from "./StartPage";
 import ConnectToSSHModal from "../workspaces/ConnectToSSHModal";
 import Alert from "../components/Alert";
-import LogsView from "./LogsView";
+
 const sessionId = v4();
 
 const WorkspaceLogs = React.lazy(() => import("../components/WorkspaceLogs"));
@@ -443,7 +443,12 @@ export default class StartWorkspace extends React.Component<StartWorkspaceProps,
             // or as a headless workspace.
             case "running":
                 if (isPrebuild) {
-                    return <HeadlessWorkspaceView instanceId={this.state.workspaceInstance.id} />;
+                    return (
+                        <HeadlessWorkspaceView
+                            instanceId={this.state.workspaceInstance.id}
+                            workspaceId={this.props.workspaceId}
+                        />
+                    );
                 }
                 if (!this.state.desktopIde) {
                     phase = StartPhase.Running;
@@ -570,7 +575,12 @@ export default class StartWorkspace extends React.Component<StartWorkspaceProps,
             // Stopping means that the workspace is currently shutting down. It could go to stopped every moment.
             case "stopping":
                 if (isPrebuild) {
-                    return <HeadlessWorkspaceView instanceId={this.state.workspaceInstance.id} />;
+                    return (
+                        <HeadlessWorkspaceView
+                            instanceId={this.state.workspaceInstance.id}
+                            workspaceId={this.props.workspaceId}
+                        />
+                    );
                 }
                 phase = StartPhase.Stopping;
                 statusMessage = (
@@ -721,7 +731,7 @@ function ImageBuildView(props: ImageBuildViewProps) {
     );
 }
 
-function HeadlessWorkspaceView(props: { instanceId: string }) {
+function HeadlessWorkspaceView(props: { instanceId: string; workspaceId?: string }) {
     const [logsEmitter] = useState(new EventEmitter());
 
     useEffect(() => {
@@ -737,5 +747,9 @@ function HeadlessWorkspaceView(props: { instanceId: string }) {
         };
     }, []);
 
-    return <LogsView logsEmitter={logsEmitter} />;
+    return (
+        <StartPage title="Prebuild in Progress">
+            <PrebuildLogs workspaceId={props.workspaceId} />
+        </StartPage>
+    );
 }

components/server/src/workspace/gitpod-server-impl.ts

@@ -2245,10 +2245,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
     public async getPrebuild(ctx: TraceContext, prebuildId: string): Promise<PrebuildWithStatus | undefined> {
         traceAPIParams(ctx, { prebuildId });
-
-        const user = this.checkAndBlockUser("getPrebuild");
-        await this.guardProjectOperation(user, prebuildId, "get");
-
+        this.checkUser("getPrebuild");
         return this.projectsService.getPrebuild(prebuildId);
     }