Skip to content

Commit 65c8757

Browse files
kylecarbskylecarbs
committed
Hide build logs until a build is made
1 parent 97e5496 commit 65c8757

File tree

6 files changed

+92
-61
lines changed

6 files changed

+92
-61
lines changed

‎site/src/components/TemplateVersionEditor/FileTree.tsx

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Menu from "@material-ui/core/Menu"
77
import MenuItem from "@material-ui/core/MenuItem"
88
import { FC, useMemo, useState } from "react"
99
import { TemplateVersionFiles } from "util/templateVersion"
10+
import { DockerIcon } from "components/Icons/DockerIcon"
1011

1112
export interface File {
1213
path: string
@@ -131,17 +132,21 @@ export const FileTree: FC<{
131132
onClose={() => setContextMenu(undefined)}
132133
open={Boolean(contextMenu)}
133134
anchorReference="anchorPosition"
134-
anchorPosition={contextMenu ? {
135-
top: contextMenu.clientY,
136-
left: contextMenu.clientX,
137-
} : undefined}
135+
anchorPosition={
136+
contextMenu
137+
? {
138+
top: contextMenu.clientY,
139+
left: contextMenu.clientX,
140+
}
141+
: undefined
142+
}
138143
anchorOrigin={{
139-
vertical: 'top',
140-
horizontal: 'left',
144+
vertical: "top",
145+
horizontal: "left",
141146
}}
142147
transformOrigin={{
143-
vertical: 'top',
144-
horizontal: 'left',
148+
vertical: "top",
149+
horizontal: "left",
145150
}}
146151
>
147152
<MenuItem
@@ -244,10 +249,4 @@ const FileTypeMarkdown = () => (
244249
</svg>
245250
)
246251

247-
const FileTypeDockerfile = () => (
248-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="#0db7ed">
249-
<path d="M16,2A14,14,0,1,0,30,16,14,14,0,0,0,16,2Zm0,26A12,12,0,1,1,28,16,12,12,0,0,1,16,28Z" />
250-
<path d="M16,6a10,10,0,0,0-9.9,9.1H6.1A8,8,0,0,1,16,8a8,8,0,0,1,8,8,8,8,0,0,1-8,8,8,8,0,0,1-7.9-6.1H6.1A10,10,0,0,0,16,26a10,10,0,0,0,0-20Z" />
251-
<path d="M16,10a6,6,0,0,0-6,6,6,6,0,0,0,6,6,6,6,0,0,0,6-6A6,6,0,0,0,16,10Zm0,10a4,4,0,0,1-4-4,4,4,0,0,1,4-4,4,4,0,0,1,4,4A4,4,0,0,1,16,20Z" />
252-
</svg>
253-
)
252+
const FileTypeDockerfile = () => <DockerIcon />

‎site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx

Lines changed: 53 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import Button from "@material-ui/core/Button"
22
import IconButton from "@material-ui/core/IconButton"
33
import { makeStyles, Theme } from "@material-ui/core/styles"
4-
import Tab from "@material-ui/core/Tab"
5-
import Tabs from "@material-ui/core/Tabs"
64
import Tooltip from "@material-ui/core/Tooltip"
75
import CreateIcon from "@material-ui/icons/AddBox"
86
import BuildIcon from "@material-ui/icons/BuildOutlined"
@@ -130,8 +128,13 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
130128
const [dirty, setDirty] = useState(false)
131129
const hasIcon = template.icon && template.icon !== ""
132130
const templateVersionSucceeded = templateVersion.job.status === "succeeded"
131+
const showBuildLogs = Boolean(buildLogs)
132+
useEffect(() => {
133+
window.dispatchEvent(new Event("resize"))
134+
}, [showBuildLogs])
133135
const styles = useStyles({
134136
templateVersionSucceeded,
137+
showBuildLogs,
135138
})
136139

137140
return (
@@ -151,7 +154,7 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
151154
</div>
152155

153156
<div className={styles.topbarSides}>
154-
<div>
157+
<div className={styles.buildStatus}>
155158
Build Status:
156159
<TemplateVersionStatusBadge version={templateVersion} />
157160
</div>
@@ -170,22 +173,25 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
170173

171174
<Tooltip
172175
title={
173-
dirty ? "You have edited files! Run another build before updating." :
174-
templateVersion.job.status !== "succeeded" ? "Something" : ""
176+
dirty
177+
? "You have edited files! Run another build before updating."
178+
: templateVersion.job.status !== "succeeded"
179+
? "Something"
180+
: ""
175181
}
176182
>
177183
<span>
178-
<Button
179-
size="small"
180-
variant="contained"
181-
color="primary"
182-
disabled={dirty || disableUpdate}
183-
onClick={() => {
184-
onUpdate()
185-
}}
186-
>
187-
Publish New Version
188-
</Button>
184+
<Button
185+
size="small"
186+
variant="contained"
187+
color="primary"
188+
disabled={dirty || disableUpdate}
189+
onClick={() => {
190+
onUpdate()
191+
}}
192+
>
193+
Publish New Version
194+
</Button>
189195
</span>
190196
</Tooltip>
191197
</div>
@@ -195,19 +201,20 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
195201
<div className={styles.sidebar}>
196202
<div className={styles.sidebarTitle}>
197203
Template Editor
198-
<Tooltip title="Create File" placement="top">
199-
<IconButton
200-
size="small"
201-
color="secondary"
202-
aria-label="Create File"
203-
onClick={(event) => {
204-
setCreateFileOpen(true)
205-
event.currentTarget.blur()
206-
}}
207-
>
208-
<CreateIcon />
209-
</IconButton>
210-
</Tooltip>
204+
<div className={styles.sidebarActions}>
205+
<Tooltip title="Create File" placement="top">
206+
<IconButton
207+
size="small"
208+
aria-label="Create File"
209+
onClick={(event) => {
210+
setCreateFileOpen(true)
211+
event.currentTarget.blur()
212+
}}
213+
>
214+
<CreateIcon />
215+
</IconButton>
216+
</Tooltip>
217+
</div>
211218
<CreateFileDialog
212219
open={createFileOpen}
213220
onClose={() => {
@@ -379,6 +386,7 @@ const useStyles = makeStyles<
379386
Theme,
380387
{
381388
templateVersionSucceeded: boolean
389+
showBuildLogs: boolean
382390
}
383391
>((theme) => ({
384392
root: {
@@ -401,6 +409,11 @@ const useStyles = makeStyles<
401409
alignItems: "center",
402410
gap: 16,
403411
},
412+
buildStatus: {
413+
display: "flex",
414+
alignItems: "center",
415+
gap: 8,
416+
},
404417
sidebarAndEditor: {
405418
display: "flex",
406419
flex: 1,
@@ -413,11 +426,20 @@ const useStyles = makeStyles<
413426
textTransform: "uppercase",
414427
padding: "8px 16px",
415428
color: theme.palette.text.hint,
429+
display: "flex",
430+
alignItems: "center",
431+
},
432+
sidebarActions: {
433+
marginLeft: "auto",
434+
"& svg": {
435+
fill: theme.palette.text.hint,
436+
},
416437
},
417438
editorPane: {
418439
display: "grid",
419440
width: "100%",
420-
gridTemplateColumns: "0.6fr 0.4fr",
441+
gridTemplateColumns: (props) =>
442+
props.showBuildLogs ? "0.6fr 0.4fr" : "1fr 0fr",
421443
height: `calc(100vh - ${navHeight + topbarHeight}px)`,
422444
overflow: "hidden",
423445
},
@@ -495,6 +517,6 @@ const useStyles = makeStyles<
495517
whiteSpace: "pre-wrap",
496518
},
497519
resources: {
498-
padding: 16,
520+
// padding: 16,
499521
},
500522
}))

‎site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,16 @@ export const WorkspaceBuildLogs: FC<WorkspaceBuildLogsProps> = ({
8686
)
8787
}
8888

89-
const useStyles = makeStyles<Theme, {
90-
templateEditorPane: boolean
91-
}>((theme) => ({
89+
const useStyles = makeStyles<
90+
Theme,
91+
{
92+
templateEditorPane: boolean
93+
}
94+
>((theme) => ({
9295
logs: {
9396
border: `1px solid ${theme.palette.divider}`,
94-
borderRadius: (props) => props.templateEditorPane ? "0px" : theme.shape.borderRadius,
97+
borderRadius: (props) =>
98+
props.templateEditorPane ? "0px" : theme.shape.borderRadius,
9599
fontFamily: MONOSPACE_FONT_FAMILY,
96100
},
97101

‎site/src/pages/TemplateVersionPage/TemplateVersionEditorPage/TemplateVersionEditorPage.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,19 @@ export const TemplateVersionEditorPage: FC = () => {
4242
if (!versionState.context.template) {
4343
throw new Error("no template")
4444
}
45+
// Send a cancel just in case a version is already being created!
4546
sendEvent({
46-
type: "CREATE_BUILD",
47+
type: "CANCEL_VERSION",
48+
})
49+
sendEvent({
50+
type: "CREATE_VERSION",
4751
files: files,
4852
templateId: versionState.context.template.id,
4953
})
5054
}}
5155
onUpdate={() => {
5256
sendEvent({
53-
type: "UPDATE_ACTIVE",
57+
type: "UPDATE_ACTIVE_VERSION",
5458
})
5559
}}
5660
disablePreview={editorState.hasTag("loading")}

‎site/src/pages/TemplateVersionPage/TemplateVersionPageView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ export const TemplateVersionPageView: FC<TemplateVersionPageViewProps> = ({
144144
<StatsItem
145145
label={t("stats.template")}
146146
value={
147-
<RouterLink to={`/templates/${templateName}`}>{templateName}</RouterLink>
147+
<RouterLink to={`/templates/${templateName}`}>
148+
{templateName}
149+
</RouterLink>
148150
}
149151
/>
150152
<StatsItem

‎site/src/xServices/templateVersionEditor/templateVersionEditorXService.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ export const templateVersionEditorMachine = createMachine(
3232
context: {} as TemplateVersionEditorMachineContext,
3333
events: {} as
3434
| {
35-
type: "CREATE_BUILD"
35+
type: "CREATE_VERSION"
3636
files: TemplateVersionFiles
3737
templateId: string
3838
}
39-
| { type: "CANCEL_BUILD" }
39+
| { type: "CANCEL_VERSION" }
4040
| { type: "ADD_BUILD_LOG"; log: ProvisionerJobLog }
41-
| { type: "UPDATE_ACTIVE" },
41+
| { type: "UPDATE_ACTIVE_VERSION" },
4242
services: {} as {
4343
createBuild: {
4444
data: TemplateVersion
@@ -52,11 +52,11 @@ export const templateVersionEditorMachine = createMachine(
5252
states: {
5353
idle: {
5454
on: {
55-
CREATE_BUILD: {
55+
CREATE_VERSION: {
5656
actions: ["assignCreateBuild"],
5757
target: "uploadTar",
5858
},
59-
UPDATE_ACTIVE: {
59+
UPDATE_ACTIVE_VERSION: {
6060
target: "updatingActiveVersion",
6161
},
6262
},
@@ -106,11 +106,11 @@ export const templateVersionEditorMachine = createMachine(
106106
ADD_BUILD_LOG: {
107107
actions: ["addBuildLog"],
108108
},
109-
CANCEL_BUILD: {
109+
CANCEL_VERSION: {
110110
actions: ["cancelBuild"],
111111
target: "idle",
112112
},
113-
CREATE_BUILD: {
113+
CREATE_VERSION: {
114114
actions: ["cancelBuild", "assignCreateBuild"],
115115
target: "uploadTar",
116116
},
@@ -177,7 +177,7 @@ export const templateVersionEditorMachine = createMachine(
177177
status: "running",
178178
},
179179
}
180-
}
180+
},
181181
}),
182182
},
183183
services: {

0 commit comments

Comments
 (0)