Skip to content

feat(site): display build logs history in the build log page #9150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 17, 2023
Merged

feat(site): display build logs history in the build log page #9150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4340d9
Add base changes
BrunoQuaresma Aug 16, 2023
15597a0
Merge branch 'main' of https://github.com/coder/coder into bq/improve…
BrunoQuaresma Aug 17, 2023
6ab1c5f
Add loader state and template version
BrunoQuaresma Aug 17, 2023
37542df
Fix test
BrunoQuaresma Aug 17, 2023
075d96e
improve storybook
BrunoQuaresma Aug 17, 2023
a1928ff
Solve PR comments
BrunoQuaresma Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
improve storybook
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Aug 17, 2023
commit 075d96eb1be095d3296ec5a514b15a1d453b41ec
55 changes: 36 additions & 19 deletions site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,48 @@
import { ComponentMeta, Story } from "@storybook/react"
import { Meta, StoryObj } from "@storybook/react"
import {
MockFailedWorkspaceBuild,
MockWorkspaceBuild,
MockWorkspaceBuildLogs,
} from "../../testHelpers/entities"
import {
WorkspaceBuildPageView,
WorkspaceBuildPageViewProps,
} from "./WorkspaceBuildPageView"
import { WorkspaceBuildPageView } from "./WorkspaceBuildPageView"

const defaultBuilds = [...Array(15).keys()].map((i) => ({
...MockWorkspaceBuild,
id: `${i}`,
build_number: i,
}))

export default {
title: "pages/WorkspaceBuildPageView",
const meta: Meta<typeof WorkspaceBuildPageView> = {
title: "components/WorkspaceBuildPageView",
component: WorkspaceBuildPageView,
} as ComponentMeta<typeof WorkspaceBuildPageView>
args: {
build: MockWorkspaceBuild,
logs: MockWorkspaceBuildLogs,
builds: defaultBuilds,
activeBuildNumber: defaultBuilds[0].build_number,
},
}

const Template: Story<WorkspaceBuildPageViewProps> = (args) => (
<WorkspaceBuildPageView {...args} />
)
export default meta
type Story = StoryObj<typeof WorkspaceBuildPageView>

export const Loaded: Story = {}

export const LoadingBuildLogs: Story = {
args: {
builds: undefined,
},
}

export const Example = Template.bind({})
Example.args = {
build: MockWorkspaceBuild,
logs: MockWorkspaceBuildLogs,
const failedBuild = {
...MockFailedWorkspaceBuild("delete"),
build_number: new Date().getDate(),
}

export const FailedDelete = Template.bind({})
FailedDelete.args = {
build: MockFailedWorkspaceBuild("delete"),
logs: MockWorkspaceBuildLogs,
export const FailedDelete: Story = {
args: {
build: failedBuild,
builds: [failedBuild, ...defaultBuilds],
activeBuildNumber: failedBuild.build_number,
},
}
38 changes: 32 additions & 6 deletions site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import { ProvisionerJobLog, WorkspaceBuild } from "../../api/typesGenerated"
import { Loader } from "../../components/Loader/Loader"
import { Stack } from "../../components/Stack/Stack"
import { WorkspaceBuildLogs } from "../../components/WorkspaceBuildLogs/WorkspaceBuildLogs"
import { WorkspaceBuildStateError } from "./WorkspaceBuildStateError"
import { makeStyles, useTheme } from "@mui/styles"
import { makeStyles } from "@mui/styles"
import {
FullWidthPageHeader,
PageHeaderTitle,
Expand All @@ -26,6 +25,7 @@ import {
} from "components/Sidebar/Sidebar"
import { BuildIcon } from "components/BuildIcon/BuildIcon"
import Skeleton from "@mui/material/Skeleton"
import { Alert } from "components/Alert/Alert"

const sortLogsByCreatedAt = (logs: ProvisionerJobLog[]) => {
return [...logs].sort(
Expand Down Expand Up @@ -137,7 +137,33 @@ export const WorkspaceBuildPageView: FC<WorkspaceBuildPageViewProps> = ({

<Box sx={{ height: "100%", overflowY: "auto", width: "100%" }}>
{build.transition === "delete" && build.job.status === "failed" && (
<WorkspaceBuildStateError build={build} />
<Alert
severity="error"
sx={{
borderRadius: 0,
border: 0,
background: (theme) => theme.palette.error.dark,
borderBottom: (theme) => `1px solid ${theme.palette.divider}`,
}}
>
<Box>
The workspace may have failed to delete due to a Terraform state
mismatch. A template admin may run{" "}
<Box
component="code"
display="inline-block"
width="fit-content"
fontWeight={600}
>
`
{`coder rm ${
build.workspace_owner_name + "/" + build.workspace_name
} --orphan`}
`
</Box>{" "}
to delete the workspace skipping resource destruction.
</Box>
</Alert>
)}
{!logs && <Loader />}
{logs && (
Expand All @@ -159,8 +185,6 @@ const BuildSidebarItem = ({
build: WorkspaceBuild
active: boolean
}) => {
const theme = useTheme()

return (
<Link
key={build.id}
Expand All @@ -173,7 +197,9 @@ const BuildSidebarItem = ({
sx={{
width: 16,
height: 16,
color: getDisplayWorkspaceBuildStatus(theme, build).color,
color: (theme) =>
theme.palette[getDisplayWorkspaceBuildStatus(theme, build).type]
.light,
}}
/>
<Box sx={{ overflow: "hidden" }}>
Expand Down
36 changes: 0 additions & 36 deletions site/src/pages/WorkspaceBuildPage/WorkspaceBuildStateError.tsx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ export const MockFailedWorkspaceBuild = (
deadline: "2022-05-17T23:39:00.00Z",
reason: "initiator",
resources: [],
status: "running",
status: "failed",
daily_cost: 20,
})

Expand Down