Skip to content

Commit 88666c6

Browse files
committed
Refactor WorkspaceBuildLogs components and tests
1 parent 2fe608f commit 88666c6

File tree

4 files changed

+9
-87
lines changed

4 files changed

+9
-87
lines changed

site/src/components/WorkspaceBuildLogs/Logs/Logs.tsx renamed to site/src/components/WorkspaceBuildLogs/Logs.tsx

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ import { makeStyles } from "@mui/styles";
22
import { LogLevel } from "api/typesGenerated";
33
import dayjs from "dayjs";
44
import { FC, useMemo } from "react";
5-
import { MONOSPACE_FONT_FAMILY } from "../../../theme/constants";
6-
import { combineClasses } from "../../../utils/combineClasses";
5+
import { MONOSPACE_FONT_FAMILY } from "theme/constants";
6+
import { combineClasses } from "utils/combineClasses";
77
import AnsiToHTML from "ansi-to-html";
8-
import { Theme } from "@mui/material/styles";
98

109
export interface Line {
1110
time: string;
@@ -16,19 +15,15 @@ export interface Line {
1615
export interface LogsProps {
1716
lines: Line[];
1817
hideTimestamps?: boolean;
19-
lineNumbers?: boolean;
2018
className?: string;
2119
}
2220

2321
export const Logs: FC<React.PropsWithChildren<LogsProps>> = ({
2422
hideTimestamps,
2523
lines,
26-
lineNumbers,
2724
className = "",
2825
}) => {
29-
const styles = useStyles({
30-
lineNumbers: Boolean(lineNumbers),
31-
});
26+
const styles = useStyles();
3227

3328
return (
3429
<div className={combineClasses([className, styles.root])}>
@@ -38,9 +33,7 @@ export const Logs: FC<React.PropsWithChildren<LogsProps>> = ({
3833
{!hideTimestamps && (
3934
<>
4035
<span className={styles.time}>
41-
{lineNumbers
42-
? idx + 1
43-
: dayjs(line.time).format(`HH:mm:ss.SSS`)}
36+
{dayjs(line.time).format(`HH:mm:ss.SSS`)}
4437
</span>
4538
<span className={styles.space} />
4639
</>
@@ -63,9 +56,7 @@ export const LogLine: FC<{
6356
number?: number;
6457
style?: React.CSSProperties;
6558
}> = ({ line, hideTimestamp, number, style }) => {
66-
const styles = useStyles({
67-
lineNumbers: Boolean(number),
68-
});
59+
const styles = useStyles();
6960
const output = useMemo(() => {
7061
return convert.toHtml(line.output.split(/\r/g).pop() as string);
7162
}, [line.output]);
@@ -89,12 +80,7 @@ export const LogLine: FC<{
8980
);
9081
};
9182

92-
const useStyles = makeStyles<
93-
Theme,
94-
{
95-
lineNumbers: boolean;
96-
}
97-
>((theme) => ({
83+
const useStyles = makeStyles((theme) => ({
9884
root: {
9985
minHeight: 156,
10086
padding: theme.spacing(1, 0),
@@ -116,7 +102,7 @@ const useStyles = makeStyles<
116102
fontSize: 14,
117103
color: theme.palette.text.primary,
118104
fontFamily: MONOSPACE_FONT_FAMILY,
119-
height: ({ lineNumbers }) => (lineNumbers ? logLineHeight : "auto"),
105+
height: "auto",
120106
// Whitespace is significant in terminal output for alignment
121107
whiteSpace: "pre",
122108
padding: theme.spacing(0, 4),
@@ -141,7 +127,7 @@ const useStyles = makeStyles<
141127
},
142128
time: {
143129
userSelect: "none",
144-
width: ({ lineNumbers }) => theme.spacing(lineNumbers ? 3.5 : 12.5),
130+
width: theme.spacing(12.5),
145131
whiteSpace: "pre",
146132
display: "inline-block",
147133
color: theme.palette.text.secondary,

site/src/components/WorkspaceBuildLogs/Logs/Logs.stories.tsx

Lines changed: 0 additions & 27 deletions
This file was deleted.

site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.test.ts

Lines changed: 0 additions & 37 deletions
This file was deleted.

site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import dayjs from "dayjs";
33
import { ComponentProps, FC, Fragment } from "react";
44
import { ProvisionerJobLog } from "../../api/typesGenerated";
55
import { MONOSPACE_FONT_FAMILY } from "../../theme/constants";
6-
import { Logs } from "./Logs/Logs";
6+
import { Logs } from "./Logs";
77
import Box from "@mui/material/Box";
88
import { combineClasses } from "utils/combineClasses";
99

0 commit comments

Comments
 (0)