[server][dashboard] Fix PrebuildLogs buttons (Run Prebuild, New Workspace)

Author: jankeromnes

components/dashboard/src/components/PrebuildLogs.tsx

@@ -68,47 +68,47 @@ export default function PrebuildLogs(props: PrebuildLogsProps) {
       case "unknown":
         break;
 
-        // Preparing means that we haven't actually started the workspace instance just yet, but rather
-        // are still preparing for launch. This means we're building the Docker image for the workspace.
-        case "preparing":
-          getGitpodService().server.watchWorkspaceImageBuildLogs(workspace!.id);
-          break;
-
-        // Pending means the workspace does not yet consume resources in the cluster, but rather is looking for
-        // some space within the cluster. If for example the cluster needs to scale up to accomodate the
-        // workspace, the workspace will be in Pending state until that happened.
-        case "pending":
-          break;
-
-        // Creating means the workspace is currently being created. That includes downloading the images required
-        // to run the workspace over the network. The time spent in this phase varies widely and depends on the current
-        // network speed, image size and cache states.
-        case "creating":
-          break;
-
-        // Initializing is the phase in which the workspace is executing the appropriate workspace initializer (e.g. Git
-        // clone or backup download). After this phase one can expect the workspace to either be Running or Failed.
-        case "initializing":
-          break;
-
-        // Running means the workspace is able to actively perform work, either by serving a user through Theia,
-        // or as a headless workspace.
-        case "running":
-          break;
-
-        // Interrupted is an exceptional state where the container should be running but is temporarily unavailable.
-        // When in this state, we expect it to become running or stopping anytime soon.
-        case "interrupted":
-          break;
-
-        // Stopping means that the workspace is currently shutting down. It could go to stopped every moment.
-        case "stopping":
-          break;
-
-        // Stopped means the workspace ended regularly because it was shut down.
-        case "stopped":
-          getGitpodService().server.watchWorkspaceImageBuildLogs(workspace!.id);
-          break;
+      // Preparing means that we haven't actually started the workspace instance just yet, but rather
+      // are still preparing for launch. This means we're building the Docker image for the workspace.
+      case "preparing":
+        getGitpodService().server.watchWorkspaceImageBuildLogs(workspace!.id);
+        break;
+
+      // Pending means the workspace does not yet consume resources in the cluster, but rather is looking for
+      // some space within the cluster. If for example the cluster needs to scale up to accomodate the
+      // workspace, the workspace will be in Pending state until that happened.
+      case "pending":
+        break;
+
+      // Creating means the workspace is currently being created. That includes downloading the images required
+      // to run the workspace over the network. The time spent in this phase varies widely and depends on the current
+      // network speed, image size and cache states.
+      case "creating":
+        break;
+
+      // Initializing is the phase in which the workspace is executing the appropriate workspace initializer (e.g. Git
+      // clone or backup download). After this phase one can expect the workspace to either be Running or Failed.
+      case "initializing":
+        break;
+
+      // Running means the workspace is able to actively perform work, either by serving a user through Theia,
+      // or as a headless workspace.
+      case "running":
+        break;
+
+      // Interrupted is an exceptional state where the container should be running but is temporarily unavailable.
+      // When in this state, we expect it to become running or stopping anytime soon.
+      case "interrupted":
+        break;
+
+      // Stopping means that the workspace is currently shutting down. It could go to stopped every moment.
+      case "stopping":
+        break;
+
+      // Stopped means the workspace ended regularly because it was shut down.
+      case "stopped":
+        getGitpodService().server.watchWorkspaceImageBuildLogs(workspace!.id);
+        break;
     }
     if (workspaceInstance?.status.conditions.failed) {
       setError(new Error(workspaceInstance.status.conditions.failed));

components/dashboard/src/projects/ConfigureProject.tsx

@@ -170,17 +170,19 @@ export default function () {
       <div className="flex-1 h-96 rounded-xl overflow-hidden bg-gray-100 dark:bg-gray-700 flex flex-col">
         <div className="flex-grow flex">{startPrebuildResult
           ? <PrebuildLogs workspaceId={startPrebuildResult.wsid} onInstanceUpdate={onInstanceUpdate} />
-          : <div className="flex-grow flex flex-col items-center justify-center">
+          : (!prebuildWasTriggered && <div className="flex-grow flex flex-col items-center justify-center">
               <img className="w-14" role="presentation" src={isDark ? PrebuildLogsEmptyDark : PrebuildLogsEmpty} />
               <h3 className="text-center text-lg text-gray-500 dark:text-gray-50 mt-4">No Recent Prebuild</h3>
               <p className="text-center text-base text-gray-500 dark:text-gray-400 mt-2 w-64">Edit the project configuration on the left to get started. <a className="gp-link" href="https://www.gitpod.io/docs/config-gitpod-file/">Learn more</a></p>
-            </div>
+            </div>)
         }</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">
           {prebuildWasTriggered && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} isDark={isDark} />}
           <div className="flex-grow" />
-          <button className="secondary">New Workspace</button>
-          <button disabled={isDetecting} onClick={buildProject}>Run Prebuild</button>
+          {(prebuildInstance?.status.phase === "stopped" && !prebuildInstance?.status.conditions.failed)
+              ? <a className="my-auto" href={`/#${project?.cloneUrl}`}><button className="secondary">New Workspace</button></a>
+              : <button disabled={true} className="secondary">New Workspace</button>}
+          <button disabled={isDetecting || (prebuildWasTriggered && prebuildInstance?.status.phase !== "stopped")} onClick={buildProject}>Run Prebuild</button>
         </div>
       </div>
     </div>

components/dashboard/src/projects/Prebuild.tsx

@@ -10,7 +10,7 @@ import { useContext, useEffect, useState } from "react";
 import { useLocation, useRouteMatch } from "react-router";
 import Header from "../components/Header";
 import PrebuildLogs from "../components/PrebuildLogs";
-import { getGitpodService } from "../service/service";
+import { getGitpodService, gitpodHostUrl } from "../service/service";
 import { TeamsContext, getCurrentTeam } from "../teams/teams-context";
 import { ThemeContext } from "../theme-context";
 import { prebuildStatusIcon, prebuildStatusLabel, PrebuildInstanceStatus } from "./Prebuilds";
@@ -97,8 +97,9 @@ export default function () {
                 <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">
                     {prebuildInstance && <PrebuildInstanceStatus prebuildInstance={prebuildInstance} isDark={isDark} />}
                     <div className="flex-grow" />
-                    <button className="secondary">New Workspace</button>
-                    <button>Run Prebuild</button>
+                    {prebuildInstance?.status.phase === "stopped"
+                        ? <a className="my-auto" href={gitpodHostUrl.withContext(`${prebuild?.info.changeUrl}`).toString()}><button>New Workspace</button></a>
+                        : <button disabled={true}>New Workspace</button>}
                 </div>
             </div>
         </div>

components/dashboard/src/projects/Project.tsx

@@ -63,10 +63,6 @@ export default function () {
 
     const branchContextMenu = (branch: Project.BranchDetails) => {
         const entries: ContextMenuEntry[] = [];
-        entries.push({
-            title: "New Workspace",
-            onClick: () => onNewWorkspace(branch)
-        });
         entries.push({
             title: "Rerun Prebuild",
             onClick: () => triggerPrebuild(branch),
@@ -109,10 +105,6 @@ export default function () {
         return true;
     }
 
-    const onNewWorkspace = (branch: Project.BranchDetails) => {
-        window.location.href = gitpodHostUrl.withContext(`${branch.url}`).toString();
-    }
-
     const triggerPrebuild = (branch: Project.BranchDetails) => {
         if (project) {
             getGitpodService().server.triggerPrebuild(project.id, branch.name)

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

@@ -1525,6 +1525,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl<GitpodClient, GitpodSer
             : (await this.projectsService.getBranchDetails(user, project)).filter(b => b.isDefault));
         if (branchDetails.length !== 1) {
             log.debug({ userId: user.id }, 'Cannot find branch details.', { project, branchName });
+            throw new ResponseError(ErrorCodes.NOT_FOUND, `Could not find ${!branchName ? 'a default branch' : `branch '${branchName}'`} in repository ${project.cloneUrl}`);
         }
         const contextURL = branchDetails[0].url;
 

components/server/ee/src/workspace/workspace-factory.ts

@@ -133,7 +133,7 @@ export class WorkspaceFactoryEE extends WorkspaceFactory {
             { // TODO(at) store prebuild info
                 if (project) {
                     // do not await
-                    this.storePrebuildInfo(ctx, project, pws, user).catch(err => {
+                    this.storePrebuildInfo(ctx, project, pws, ws, user).catch(err => {
                         log.error(`failed to store prebuild info`, err);
                         TraceContext.logError({span}, err);
                     });
@@ -152,39 +152,42 @@ export class WorkspaceFactoryEE extends WorkspaceFactory {
         }
     }
 
-    protected async storePrebuildInfo(ctx: TraceContext, project: Project, pws: PrebuiltWorkspace, user: User) {
+    protected async storePrebuildInfo(ctx: TraceContext, project: Project, pws: PrebuiltWorkspace, ws: Workspace, user: User) {
         const span = TraceContext.startSpan("storePrebuildInfo", ctx);
         const { userId, teamId, name: projectName, id: projectId } = project;
         const parsedUrl = parseRepoUrl(project.cloneUrl);
-        if (parsedUrl) {
-            const { owner, repo, host } = parsedUrl;
-            const repositoryProvider = this.hostContextProvider.get(host)?.services?.repositoryProvider;
-            if (repositoryProvider) {
-                const commit = await repositoryProvider.getCommitInfo(user, owner, repo, pws.commit);
-                if (commit) {
-                    await this.db.trace({span}).storePrebuildInfo({
-                        id: pws.id,
-                        buildWorkspaceId: pws.buildWorkspaceId,
-                        teamId,
-                        userId,
-                        projectName,
-                        projectId,
-                        startedAt: pws.creationTime,
-                        startedBy: "", // TODO
-                        startedByAvatar: "", // TODO
-                        cloneUrl: pws.cloneURL,
-                        branch: pws.branch || "unknown",
-                        changeAuthor: commit.author,
-                        changeAuthorAvatar: commit.authorAvatarUrl,
-                        changeDate: commit.authorDate || "",
-                        changeHash: commit.sha,
-                        changeTitle: commit.commitMessage,
-                        // changePR
-                        // changeUrl
-                    });
-                }
-            }
+        if (!parsedUrl) {
+            return;
+        }
+        const { owner, repo, host } = parsedUrl;
+        const repositoryProvider = this.hostContextProvider.get(host)?.services?.repositoryProvider;
+        if (!repositoryProvider) {
+            return;
+        }
+        const commit = await repositoryProvider.getCommitInfo(user, owner, repo, pws.commit);
+        if (!commit) {
+            return;
         }
+        await this.db.trace({span}).storePrebuildInfo({
+            id: pws.id,
+            buildWorkspaceId: pws.buildWorkspaceId,
+            teamId,
+            userId,
+            projectName,
+            projectId,
+            startedAt: pws.creationTime,
+            startedBy: "", // TODO
+            startedByAvatar: "", // TODO
+            cloneUrl: pws.cloneURL,
+            branch: pws.branch || "unknown",
+            changeAuthor: commit.author,
+            changeAuthorAvatar: commit.authorAvatarUrl,
+            changeDate: commit.authorDate || "",
+            changeHash: commit.sha,
+            changeTitle: commit.commitMessage,
+            // changePR
+            changeUrl: ws.contextURL,
+        });
     }
 
     protected async createForPrebuiltWorkspace(ctx: TraceContext, user: User, context: PrebuiltWorkspaceContext, normalizedContextURL: string): Promise<Workspace> {