Skip to content

feat(site): warn on provisioner health during builds #15589

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 18 commits into from
Nov 28, 2024
Merged

feat(site): warn on provisioner health during builds #15589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7df3b27
add alert to the create workspace page
SasSwart Nov 19, 2024
1e1262f
improve error case documentation
SasSwart Nov 19, 2024
0f78afc
add provisioner health hook
SasSwart Nov 20, 2024
f0f7216
show provisioner health warnings for templates
SasSwart Nov 21, 2024
a3eeb9c
consistent formatting for alerts across pages
SasSwart Nov 21, 2024
3cf53ef
Finalise Provisioner Warnings for Templates and template versions
SasSwart Nov 22, 2024
e281d6b
linter fixes
SasSwart Nov 22, 2024
2baa81e
Merge remote-tracking branch 'origin/main' into jjs/15048-fe
SasSwart Nov 26, 2024
0cab768
use matched_provisioners instead of a second api call
SasSwart Nov 27, 2024
b228257
provide a key to provisioner tags to keep react happy
SasSwart Nov 27, 2024
8b91dc0
fix linting issues
SasSwart Nov 27, 2024
bec2913
make fmt
SasSwart Nov 27, 2024
4796a32
Copy updates
SasSwart Nov 28, 2024
b6f99a6
make fmt
SasSwart Nov 28, 2024
aec9cba
add loader back in to build logs drawer
SasSwart Nov 28, 2024
75e7394
simplify logic
SasSwart Nov 28, 2024
0aed543
fix logic
SasSwart Nov 28, 2024
0bd9478
make fmt
SasSwart Nov 28, 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
make fmt
  • Loading branch information
@SasSwart
SasSwart committed Nov 28, 2024
commit b6f99a6f11a4582ecf5d7a510309febca5298c91
6 changes: 3 additions & 3 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 @@ -13,7 +13,7 @@ const meta: Meta<typeof ProvisionerAlert> = {
title: "Title",
detail: "Detail",
severity: "info",
tags: {"tag": "tagValue"}
tags: { tag: "tagValue" },
},
};

Expand All @@ -23,6 +23,6 @@ type Story = StoryObj<typeof ProvisionerAlert>;
export const Info: Story = {};
export const NullTags: Story = {
args: {
tags: undefined
}
tags: undefined,
},
};
2 changes: 1 addition & 1 deletion site/src/modules/provisioners/ProvisionerAlert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Alert, type AlertColor } from "components/Alert/Alert";
import { AlertDetail } from "components/Alert/Alert";
import { Stack } from "components/Stack/Stack";
import { ProvisionerTag } from "modules/provisioners/ProvisionerTag";
import { FC } from "react";
import type { FC } from "react";
interface ProvisionerAlertProps {
title: string;
detail: string;
Expand Down
3 changes: 1 addition & 2 deletions site/src/modules/provisioners/ProvisionerStatusAlert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AlertColor } from "components/Alert/Alert";
import type { AlertColor } from "components/Alert/Alert";
import type { FC } from "react";
import { ProvisionerAlert } from "./ProvisionerAlert";

Expand Down Expand Up @@ -45,4 +45,3 @@ export const ProvisionerStatusAlert: FC<ProvisionerStatusAlertProps> = ({
/>
);
};

34 changes: 18 additions & 16 deletions site/src/pages/TemplateVersionEditorPage/TemplateVersionEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import {
} from "components/FullPageLayout/Topbar";
import { Loader } from "components/Loader/Loader";
import { linkToTemplate, useLinks } from "modules/navigation";
import { ProvisionerAlert } from "modules/provisioners/ProvisionerAlert";
import { ProvisionerStatusAlert } from "modules/provisioners/ProvisionerStatusAlert";
import { TemplateFileTree } from "modules/templates/TemplateFiles/TemplateFileTree";
import { isBinaryData } from "modules/templates/TemplateFiles/isBinaryData";
import { TemplateResourcesTable } from "modules/templates/TemplateResourcesTable/TemplateResourcesTable";
Expand Down Expand Up @@ -59,8 +61,6 @@ import { MonacoEditor } from "./MonacoEditor";
import { ProvisionerTagsPopover } from "./ProvisionerTagsPopover";
import { PublishTemplateVersionDialog } from "./PublishTemplateVersionDialog";
import { TemplateVersionStatusBadge } from "./TemplateVersionStatusBadge";
import { ProvisionerStatusAlert } from "modules/provisioners/ProvisionerStatusAlert";
import { ProvisionerAlert } from "modules/provisioners/ProvisionerAlert";

type Tab = "logs" | "resources" | undefined; // Undefined is to hide the tab

Expand Down Expand Up @@ -587,20 +587,22 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
ref={logsContentRef}
>
<div>
{templateVersion.job.error ? (
<ProvisionerAlert
title="Error during the build"
detail={templateVersion.job.error}
severity="error"
tags={templateVersion.job.tags}
/>
) : !gotBuildLogs && (
<ProvisionerStatusAlert
matchingProvisioners={matchingProvisioners}
availableProvisioners={availableProvisioners}
tags={templateVersion.job.tags}
/>
)}
{templateVersion.job.error ? (
<ProvisionerAlert
title="Error during the build"
detail={templateVersion.job.error}
severity="error"
tags={templateVersion.job.tags}
/>
) : (
!gotBuildLogs && (
<ProvisionerStatusAlert
matchingProvisioners={matchingProvisioners}
availableProvisioners={availableProvisioners}
tags={templateVersion.job.tags}
/>
)
)}
</div>

{buildLogs && buildLogs.length > 0 ? (
Expand Down
Loading