10000 feat(site): add a provisioner warning to workspace builds by SasSwart · Pull Request #15686 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat(site): add a provisioner warning to workspace builds #15686

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 32 commits into from
Dec 11, 2024
Merged

feat(site): add a provisioner warning to workspace builds #15686

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1c08ee4
add alert for workspace provisioning
SasSwart Nov 29, 2024
6bd9e00
Merge remote-tracking branch 'origin/main' into jjs/workspace-provisi…
SasSwart Dec 3, 2024
ad9725e
Add provisioner health warning to workspace page
SasSwart Dec 4, 2024
0056301
Add back build logs component
SasSwart Dec 5, 2024
cbeb0dd
make fmt
SasSwart Dec 5, 2024
32aec0b
remove defunct props
SasSwart Dec 5, 2024
79896b2
review notes, documentation and make fmt
SasSwart Dec 5, 2024
319bfce
lint
SasSwart Dec 5, 2024
3d34844
make fmt
SasSwart Dec 5, 2024
ffb5934
review notes
SasSwart Dec 5, 2024
a3c4726
expose provisioner daemons for pending jobs via the api
SasSwart Dec 9, 2024
18412e0
Merge remote-tracking branch 'origin' into jjs/workspace-provisioner-…
SasSwart Dec 9, 2024
ec57690
add back a function that went missing somehow
SasSwart Dec 9, 2024
53cc203
8000 use the correct sqlc version
SasSwart Dec 9, 2024
5fac5ba
fix tests
SasSwart Dec 9, 2024
81fc829
fix tests
SasSwart Dec 9, 2024
dcf12b5
fix tests
SasSwart Dec 9, 2024
fcd7e2e
fix tests
SasSwart Dec 9, 2024
aa5fa4e
update golden files
SasSwart Dec 9, 2024
528b187
Rename new query
SasSwart Dec 9, 2024
d222432
make gen
SasSwart Dec 9, 2024
7b46ffe
make gen
SasSwart Dec 9, 2024
4ccf5d4
add workspaceloadingpage
SasSwart Dec 10, 2024
b954c93
make fmt
SasSwart Dec 10, 2024
38a9b21
fix provisioner warning display on workspace builds
SasSwart Dec 10, 2024
db62476
use the correct loader in the workspace page
SasSwart Dec 10, 2024
5885197
add tests
SasSwart Dec 11, 2024
f91c8ff
show workspace build logs at the appropriate time
SasSwart Dec 11, 2024
ad95c07
update dbmem to match provisioner daemon queries
SasSwart Dec 11, 2024
d2e1612
fix authz test
SasSwart Dec 11, 2024
c9bb07d
fix tests
SasSwart Dec 11, 2024
feaec5a
make gen
SasSwart Dec 11, 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
review notes, documentation and make fmt
  • Loading branch information
@SasSwart
SasSwart committed Dec 5, 2024
commit 79896b2533064a96c8e16ccf9d51db82196ae8db
4 changes: 2 additions & 2 deletions site/src/modules/provisioners/ProvisionerAlert.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const Info: Story = {};

export const InfoStyledForLogs: Story = {
args: {
variant: AlertVariant.InLogs,
variant: AlertVariant.Inline,
},
};

Expand All @@ -37,7 +37,7 @@ export const Warning: Story = {
export const WarningStyledForLogs: Story = {
args: {
severity: "warning",
variant: AlertVariant.InLogs,
variant: AlertVariant.Inline,
},
};

Expand Down
35 changes: 23 additions & 12 deletions site/src/modules/provisioners/ProvisionerAlert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ import { ProvisionerTag } from "modules/provisioners/ProvisionerTag";
import type { FC } from "react";

export enum AlertVariant {
// Alerts are usually styled with a ful 8000 l rounded border and meant to use as a visually distinct element of the page.
// The Standalone variant conforms to this styling.
Standalone = "Standalone",
InLogs = "InLogs",
// We show these same alerts in environments such as log drawers where we stream the logs from builds.
// In this case the full border is incongruent with the surroundings of the component.
// The Inline variant replaces the full rounded border with a left border and a divider so that it complements the surroundings.
Inline = "Inline",
}

interface ProvisionerAlertProps {
Expand All @@ -18,6 +23,22 @@ interface ProvisionerAlertProps {
variant?: AlertVariant;
}

const getAlertStyles = (variant: AlertVariant, severity: AlertColor) => {
switch (variant) {
case AlertVariant.Inline:
return {
css: (theme) => ({
borderRadius: 0,
border: 0,
borderBottom: `1px solid ${theme.palette.divider}`,
borderLeft: `2px solid ${theme.palette[severity].main}`,
}),
};
default:
return {};
}
};

export const ProvisionerAlert: FC<ProvisionerAlertProps> = ({
title,
detail,
Expand All @@ -26,17 +47,7 @@ export const ProvisionerAlert: FC<ProvisionerAlertProps> = ({
variant = AlertVariant.Standalone,
}) => {
return (
<Alert
severity={severity}
{...(variant === AlertVariant.InLogs && {
css: (theme) => ({
borderRadius: 0,
border: 0,
borderBottom: `1px solid ${theme.palette.divider}`,
borderLeft: `2px solid ${theme.palette[severity].main}`,
}),
})}
>
<Alert severity={severity} {...getAlertStyles(variant, severity)}>
<AlertTitle>{title}</AlertTitle>
<AlertDetail>
<div>{detail}</div>
Expand Down
4 changes: 2 additions & 2 deletions site/src/modules/provisioners/ProvisionerStatusAlert.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const NoMatchingProvisioners: Story = {
export const NoMatchingProvisionersInLogs: Story = {
args: {
matchingProvisioners: 0,
variant: AlertVariant.InLogs,
variant: AlertVariant.Inline,
},
};

Expand All @@ -66,6 +66,6 @@ export const NoAvailableProvisionersInLogs: Story = {
args: {
matchingProvisioners: 1,
availableProvisioners: 0,
variant: AlertVariant.InLogs,
variant: AlertVariant.Inline,
},
};
2 changes: 1 addition & 1 deletion site/src/pages/CreateTemplatePage/BuildLogsDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export const BuildLogsDrawer: FC<BuildLogsDrawerProps> = ({
matchingProvisioners={matchingProvisioners}
availableProvisioners={availableProvisioners}
tags={templateVersion?.job.tags ?? {}}
variant={AlertVariant.InLogs}
variant={AlertVariant.Inline}
/>
<Loader />
</>
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/TemplateVersionEditorPage/TemplateVersionEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
detail={templateVersion.job.error}
severity="error"
tags={templateVersion.job.tags}
variant={AlertVariant.InLogs}
variant={AlertVariant.Inline}
/>
</div>
) : (
Expand All @@ -604,7 +604,7 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
matchingProvisioners={matchingProvisioners}
availableProvisioners={availableProvisioners}
tags={templateVersion.job.tags}
variant={AlertVariant.InLogs}
variant={AlertVariant.Inline}
/>
<Loader css={{ height: "100%" }} />
</>
Expand Down
Loading
0