Prebuilds Page #4876
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
|
|
||
| import EventEmitter from "events"; | ||
| import React, { Suspense, useEffect, useState } from "react"; | ||
| import { Workspace, WorkspaceInstance, DisposableCollection, WorkspaceImageBuild, HEADLESS_LOG_STREAM_STATUS_CODE_REGEX } from "@gitpod/gitpod-protocol"; | ||
| import { getGitpodService } from "../service/service"; | ||
|
|
||
| const WorkspaceLogs = React.lazy(() => import('./WorkspaceLogs')); | ||
|
|
@@ -15,8 +15,7 @@ export default function PrebuildLogs(props: { workspaceId?: string }) { | |
| const [ workspace, setWorkspace ] = useState<Workspace | undefined>(); | ||
| const [ workspaceInstance, setWorkspaceInstance ] = useState<WorkspaceInstance | undefined>(); | ||
| const [ error, setError ] = useState<Error | undefined>(); | ||
AlexTugarev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const [ logsEmitter ] = useState(new EventEmitter()); | ||
|
There was a problem hiding this comment. @jankeromnes logs were sent to the wrong emitter. |
||
|
|
||
| useEffect(() => { | ||
| const disposables = new DisposableCollection(); | ||
|
|
@@ -25,12 +24,12 @@ export default function PrebuildLogs(props: { workspaceId?: string }) { | |
| return; | ||
| } | ||
| try { | ||
| const info = await getGitpodService().server.getWorkspace(props.workspaceId); | ||
| if (info.latestInstance) { | ||
| setWorkspace(info.workspace); | ||
| setWorkspaceInstance(info.latestInstance); | ||
| } | ||
| disposables.push(getGitpodService().registerClient({ | ||
| onInstanceUpdate: setWorkspaceInstance, | ||
| onWorkspaceImageBuildLogs: (info: WorkspaceImageBuild.StateInfo, content?: WorkspaceImageBuild.LogContent) => { | ||
| if (!content) { | ||
|
|
@@ -40,7 +39,7 @@ export default function PrebuildLogs(props: { workspaceId?: string }) { | |
| }, | ||
| })); | ||
| if (info.latestInstance) { | ||
| disposables.push(watchHeadlessLogs(info.latestInstance.id, chunk => { | ||
| logsEmitter.emit('logs', chunk); | ||
| }, async () => workspaceInstance?.status.phase === 'stopped')); | ||
| } | ||
|
|
@@ -64,7 +63,7 @@ export default function PrebuildLogs(props: { workspaceId?: string }) { | |
| // 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 | ||
|
|
@@ -100,7 +99,7 @@ export default function PrebuildLogs(props: { workspaceId?: string }) { | |
|
|
||
| // Stopped means the workspace ended regularly because it was shut down. | ||
| case "stopped": | ||
| getGitpodService().server.watchWorkspaceImageBuildLogs(workspace!.id); | ||
| break; | ||
| } | ||
| if (workspaceInstance?.status.conditions.failed) { | ||
|
|
@@ -109,7 +108,6 @@ export default function PrebuildLogs(props: { workspaceId?: string }) { | |
| }, [ workspaceInstance?.status.phase ]); | ||
|
|
||
| return <> | ||
| <Suspense fallback={<div />}> | ||
| <WorkspaceLogs classes="h-64 w-full" logsEmitter={logsEmitter} errorMessage={error?.message} /> | ||
| </Suspense> | ||
|
|
@@ -121,7 +119,7 @@ export default function PrebuildLogs(props: { workspaceId?: string }) { | |
| </>; | ||
| } | ||
|
|
||
| export function watchHeadlessLogs(instanceId: string, onLog: (chunk: string) => void, checkIsDone: () => Promise<boolean>): DisposableCollection { | ||
| const disposables = new DisposableCollection(); | ||
|
|
||
| const startWatchingLogs = async () => { | ||
|
|
@@ -140,7 +138,7 @@ export function watchHeadlessLogs(server: GitpodServer, instanceId: string, onLo | |
| let response: Response | undefined = undefined; | ||
| let reader: ReadableStreamDefaultReader<Uint8Array> | undefined = undefined; | ||
| try { | ||
| const logSources = await getGitpodService().server.getHeadlessLog(instanceId); | ||
| // TODO(gpl) Only listening on first stream for now | ||
| const streamIds = Object.keys(logSources.streams); | ||
| if (streamIds.length < 1) { | ||
|
|
||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
|
|
||
| import React, { Suspense, useContext, useEffect, useState } from "react"; | ||
| import { useLocation, useRouteMatch } from "react-router"; | ||
| import { CreateWorkspaceMode, Project, WorkspaceCreationResult } from "@gitpod/gitpod-protocol"; | ||
| import PrebuildLogs from "../components/PrebuildLogs"; | ||
| import TabMenuItem from "../components/TabMenuItem"; | ||
| import { getGitpodService } from "../service/service"; | ||
|
|
@@ -53,7 +53,7 @@ export default function () { | |
| const location = useLocation(); | ||
| const team = getCurrentTeam(location, teams); | ||
| const routeMatch = useRouteMatch<{ teamSlug: string, projectSlug: string }>("/:teamSlug/:projectSlug/configure"); | ||
| const [ project, setProject ] = useState<Project | undefined>(); | ||
| const [ gitpodYml, setGitpodYml ] = useState<string>(''); | ||
| const [ dockerfile, setDockerfile ] = useState<string>(''); | ||
| const [ editorError, setEditorError ] = useState<React.ReactNode | null>(null); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -219,11 +219,15 @@ export default function NewProject() { | |
| <div className="text-base text-gray-900 dark:text-gray-50 font-medium rounded-xl whitespace-nowrap">{toSimpleName(r.name)}</div> | ||
| <p>Updated {moment(r.updatedAt).fromNow()}</p> | ||
| </div> | ||
| <div className="flex justify-end"> | ||
| <div className="h-full my-auto flex self-center opacity-0 group-hover:opacity-100"> | ||
| {!r.inUse ? ( | ||
| <button className="primary" onClick={() => setSelectedRepo(r.name)}>Select</button> | ||
|
There was a problem hiding this comment. issue: Specs for repository selection are being updated and we no longer need the primary button on hover, see #4948. However, this is probably out of the scope these changes. For the secondary option below we can use a tooltip on hover to indicate a projects is already taken. 💡 |
||
| ) : ( | ||
| <p className="my-auto">already taken</p> | ||
| )} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ))} | ||
| </div> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,78 @@ | ||||||
| /** | ||||||
| * Copyright (c) 2021 Gitpod GmbH. All rights reserved. | ||||||
| * Licensed under the GNU Affero General Public License (AGPL). | ||||||
| * See License-AGPL.txt in the project root for license information. | ||||||
| */ | ||||||
|
|
||||||
| import moment from "moment"; | ||||||
| import { PrebuildInfo } from "@gitpod/gitpod-protocol"; | ||||||
| import { useContext, useEffect, useState } from "react"; | ||||||
| import { useLocation, useRouteMatch } from "react-router"; | ||||||
| import Header from "../components/Header"; | ||||||
| import { getGitpodService } from "../service/service"; | ||||||
| import { TeamsContext, getCurrentTeam } from "../teams/teams-context"; | ||||||
| import { prebuildStatusIcon, prebuildStatusLabel } from "./Prebuilds"; | ||||||
| import PrebuildLogs from "../components/PrebuildLogs"; | ||||||
| import { shortCommitMessage } from "./render-utils"; | ||||||
|
|
||||||
| export default function () { | ||||||
| const { teams } = useContext(TeamsContext); | ||||||
| const location = useLocation(); | ||||||
| const match = useRouteMatch<{ team: string, project: string, prebuildId: string }>("/:team/:project/:prebuildId"); | ||||||
| const projectName = match?.params?.project; | ||||||
| const prebuildId = match?.params?.prebuildId; | ||||||
| const team = getCurrentTeam(location, teams); | ||||||
|
|
||||||
| const [prebuild, setPrebuild] = useState<PrebuildInfo | undefined>(); | ||||||
|
|
||||||
| useEffect(() => { | ||||||
| if (!team || !projectName || !prebuildId) { | ||||||
| return; | ||||||
| } | ||||||
| (async () => { | ||||||
| const prebuilds = await getGitpodService().server.findPrebuilds({ | ||||||
| projectName, | ||||||
| teamId: team.id, | ||||||
| prebuildId | ||||||
| }); | ||||||
| setPrebuild(prebuilds[0]); | ||||||
| })(); | ||||||
| }, [team]); | ||||||
|
|
||||||
|
|
||||||
| const renderTitle = () => { | ||||||
| if (!prebuild) { | ||||||
| return "unknown prebuild"; | ||||||
| } | ||||||
| return (<h1 className="tracking-tight">{prebuild.branch} <span className="text-gray-200">#{prebuild.branchPrebuildNumber}</span></h1>); | ||||||
|
There was a problem hiding this comment. nitpick: Minor color fix. 🖍️
Suggested change
|
||||||
| }; | ||||||
|
|
||||||
| const renderSubtitle = () => { | ||||||
| if (!prebuild) { | ||||||
| return ""; | ||||||
| } | ||||||
| const statusIcon = prebuildStatusIcon(prebuild.status); | ||||||
| const status = prebuildStatusLabel(prebuild.status); | ||||||
| const startedByAvatar = prebuild.startedByAvatar && <img className="rounded-full w-4 h-4 inline-block align-text-bottom mr-2" src={prebuild.startedByAvatar || ''} alt={prebuild.startedBy} />; | ||||||
| return (<div className="flex"> | ||||||
| <div className="text-base text-gray-900 dark:text-gray-50 font-medium uppercase"> | ||||||
| <div className="inline-block align-text-bottom mr-2 w-4 h-4">{statusIcon}</div> | ||||||
| {status} | ||||||
| </div> | ||||||
| <p className="mx-2 my-auto">·</p> | ||||||
| <div className="my-auto"> | ||||||
| <p>{startedByAvatar}Triggered {moment(prebuild.startedAt).fromNow()}</p> | ||||||
|
There was a problem hiding this comment. question: Is it expected to see the avatar missing from everywhere? |
||||||
| </div> | ||||||
| <p className="mx-2 my-auto">·</p> | ||||||
| <div className="my-auto"> | ||||||
| <p className="text-gray-500 dark:text-gray-50">{shortCommitMessage(prebuild.changeTitle)}</p> | ||||||
| </div> | ||||||
| </div>) | ||||||
| }; | ||||||
|
|
||||||
| return <> | ||||||
| <Header title={renderTitle()} subtitle={renderSubtitle()} /> | ||||||
| <div className="w-full"><PrebuildLogs workspaceId={prebuild?.buildWorkspaceId}/></div> | ||||||
| </> | ||||||
|
|
||||||
| } | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue: Fetching active branches and prebuilds requires a noticable amount of time, 5 seconds or more. Is there anything we could do in this iteration to make this smoother? If not, let's add a follow up issue for adding a loading indicator in a future iteration. ⏱️