Skip to content

Commit 2f71ed5

Browse files
committed
fix
1 parent e2eab2b commit 2f71ed5

File tree

3 files changed

+36
-41
lines changed

3 files changed

+36
-41
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import { FC } from "react"
2+
import * as TypesGen from "api/typesGenerated"
3+
import { AlertBanner } from "components/AlertBanner/AlertBanner"
4+
import { Maybe } from "components/Conditionals/Maybe"
5+
import Link from "@material-ui/core/Link"
6+
7+
export interface TemplateVersionWarnings {
8+
warnings?: TypesGen.TemplateVersionWarning[]
9+
}
10+
11+
export const TemplateVersionWarnings: FC<
12+
React.PropsWithChildren<TemplateVersionWarnings>
13+
> = ({ warnings }) => {
14+
if (!warnings) {
15+
return <></>
16+
}
17+
18+
return (
19+
<Maybe condition={Boolean(warnings.includes("DEPRECATED_PARAMETERS"))}>
20+
<AlertBanner severity="warning">
21+
<div>
22+
This template uses legacy parameters which will be deprecated in the
23+
next Coder release. Learn how to migrate in{" "}
24+
<Link href="https://coder.com/docs/v2/latest/templates/parameters#migration">
25+
our documentation
26+
</Link>
27+
.
28+
</div>
29+
</AlertBanner>
30+
</Maybe>
31+
)
32+
}

site/src/components/Workspace/Workspace.tsx

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ import {
2626
PageHeaderTitle,
2727
PageHeaderSubtitle,
2828
} from "components/PageHeader/FullWidthPageHeader"
29-
import { Maybe } from "components/Conditionals/Maybe"
30-
import { Link } from "@material-ui/core"
29+
import { TemplateVersionWarnings } from "components/TemplateVersionWarnings/TemplateVersionWarnings"
3130

3231
export enum WorkspaceErrors {
3332
GET_BUILDS_ERROR = "getBuildsError",
@@ -190,24 +189,7 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
190189
handleClick={() => navigate(`/templates`)}
191190
/>
192191

193-
{templateWarnings && (
194-
<Maybe
195-
condition={Boolean(
196-
templateWarnings.includes("DEPRECATED_PARAMETERS"),
197-
)}
198-
>
199-
<AlertBanner severity="warning">
200-
<div>
201-
This template uses legacy parameters which will be deprecated
202-
in the next Coder release. Learn how to migrate in{" "}
203-
<Link href="https://coder.com/docs/v2/latest/templates/parameters#migration">
204-
our documentation
205-
</Link>
206-
.
207-
</div>
208-
</AlertBanner>
209-
</Maybe>
210-
)}
192+
<TemplateVersionWarnings warnings={templateWarnings} />
211193

212194
{failedBuildLogs && (
213195
<Stack>

site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.tsx

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ import { FC, useEffect } from "react"
1111
import { DAUChart } from "../../../components/DAUChart/DAUChart"
1212
import { TemplateSummaryData } from "./data"
1313
import { useLocation, useNavigate } from "react-router-dom"
14-
import { Maybe } from "components/Conditionals/Maybe"
15-
import { AlertBanner } from "components/AlertBanner/AlertBanner"
16-
import Link from "@material-ui/core/Link"
14+
import { TemplateVersionWarnings } from "components/TemplateVersionWarnings/TemplateVersionWarnings"
1715

1816
export interface TemplateSummaryPageViewProps {
1917
data?: TemplateSummaryData
@@ -51,24 +49,7 @@ export const TemplateSummaryPageView: FC<TemplateSummaryPageViewProps> = ({
5149

5250
return (
5351
<Stack spacing={4}>
54-
{activeVersion.warnings && (
55-
<Maybe
56-
condition={Boolean(
57-
activeVersion.warnings.includes("DEPRECATED_PARAMETERS"),
58-
)}
59-
>
60-
<AlertBanner severity="warning">
61-
<div>
62-
This template uses legacy parameters which will be deprecated in
63-
the next Coder release. Learn how to migrate in{" "}
64-
<Link href="https://coder.com/docs/v2/latest/templates/parameters#migration">
65-
our documentation
66-
</Link>
67-
.
68-
</div>
69-
</AlertBanner>
70-
</Maybe>
71-
)}
52+
<TemplateVersionWarnings warnings={activeVersion.warnings} />
7253
<TemplateStats template={template} activeVersion={activeVersion} />
7354
{daus && <DAUChart daus={daus} />}
7455
<TemplateResourcesTable resources={getStartedResources(resources)} />

0 commit comments

Comments
 (0)