Skip to content

feat(site): show previous agent scripts logs #12233

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 12 commits into from
Feb 21, 2024
Merged

feat(site): show previous agent scripts logs #12233

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
707e60e
WIP: Refactor agent logs and tabs to be reusable
BrunoQuaresma Feb 16, 2024
0d1fb45
Merge branch 'main' of https://github.com/coder/coder into bq/show-ag…
BrunoQuaresma Feb 20, 2024
5436b15
Display tabs for agent logs
BrunoQuaresma Feb 20, 2024
67bf84b
Minor visual tweaks
BrunoQuaresma Feb 20, 2024
4258969
Merge branch 'main' of https://github.com/coder/coder into bq/show-ag…
BrunoQuaresma Feb 21, 2024
93b1184
Use padding x as const
BrunoQuaresma Feb 21, 2024
94a64e9
Simplify agents selection
BrunoQuaresma Feb 21, 2024
dbdbedd
Fix tabs storybook
BrunoQuaresma Feb 21, 2024
29429a7
Add test to ensure agent logs are displayed
BrunoQuaresma Feb 21, 2024
728af1a
Merge branch 'main' of https://github.com/coder/coder into bq/show-ag…
BrunoQuaresma Feb 21, 2024
20f25e1
Remove ref
BrunoQuaresma Feb 21, 2024
da45599
Merge branch 'main' of https://github.com/coder/coder into bq/show-ag…
BrunoQuaresma Feb 21, 2024
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
Minor visual tweaks
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Feb 20, 2024
commit 67bf84b2fe8a7caca017c864ecb68beb08628d5f
2 changes: 1 addition & 1 deletion site/src/modules/workspaces/WorkspaceBuildLogs/Logs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const styles = {
height: "auto",
// Whitespace is significant in terminal output for alignment
whiteSpace: "pre",
padding: `0 ${DEFAULT_LOG_LINE_SIDE_PADDING}px`,
padding: `0 var(--log-line-side-padding, ${DEFAULT_LOG_LINE_SIDE_PADDING}px)`,

"&.error": {
backgroundColor: theme.roles.error.background,
Expand Down
3 changes: 2 additions & 1 deletion site/src/modules/workspaces/WorkspaceBuildLogs/WorkspaceBuildLogs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,13 @@ const styles = {
header: (theme) => ({
fontSize: 13,
fontWeight: 600,
padding: `4px ${DEFAULT_LOG_LINE_SIDE_PADDING}px`,
padding: `12px var(--log-line-side-padding, ${DEFAULT_LOG_LINE_SIDE_PADDING}px)`,
display: "flex",
alignItems: "center",
fontFamily: BODY_FONT_FAMILY,
borderBottom: `1px solid ${theme.palette.divider}`,
background: theme.palette.background.default,
lineHeight: "1",

"&:last-child": {
borderBottom: 0,
Expand Down
13 changes: 12 additions & 1 deletion site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,18 @@ const BuildLogsContent: FC<{ logs?: ProvisionerJobLog[] }> = ({ logs }) => {
}

return (
<WorkspaceBuildLogs css={{ border: 0 }} logs={sortLogsByCreatedAt(logs)} />
<WorkspaceBuildLogs
css={{
border: 0,
"--log-line-side-padding": "16px",
// Add extra spacing to the first log header to prevent it from being
// too close to the tabs
"& .logs-header:first-of-type": {
paddingTop: 16,
},
}}
logs={sortLogsByCreatedAt(logs)}
/>
);
};

Expand Down