Skip to content

Commit dfa2621

Browse files
committed
descriptive lil help guys :)
1 parent 8bb49a7 commit dfa2621

File tree

1 file changed

+69
-16
lines changed

1 file changed

+69
-16
lines changed

site/src/modules/provisioners/ProvisionerGroup.tsx

Lines changed: 69 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ import { type FC, useState } from "react";
1717
import { createDayString } from "utils/createDayString";
1818
import { docs } from "utils/docs";
1919
import { ProvisionerTag } from "./ProvisionerTag";
20+
import {
21+
HelpTooltip,
22+
HelpTooltipContent,
23+
HelpTooltipText,
24+
HelpTooltipTitle,
25+
HelpTooltipTrigger,
26+
} from "components/HelpTooltip/HelpTooltip";
27+
import { Stack } from "components/Stack/Stack";
2028

2129
type ProvisionerGroupType = "builtin" | "psk" | "key";
2230

@@ -100,17 +108,15 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
100108
>
101109
{type === "builtin" && (
102110
<div css={{ lineHeight: "160%" }}>
103-
<h4 css={{ fontWeight: 500, margin: 0 }}>
104-
Built-in provisioners
105-
</h4>
111+
<BuiltinProvisionerTitle />
106112
<span css={{ color: theme.palette.text.secondary }}>
107113
{provisionerCount} &mdash; Built-in
108114
</span>
109115
</div>
110116
)}
111117
{type === "psk" && (
112118
<div css={{ lineHeight: "160%" }}>
113-
<h4 css={{ fontWeight: 500, margin: 0 }}>PSK provisioners</h4>
119+
<PskProvisionerTitle />
114120
<span css={{ color: theme.palette.text.secondary }}>
115121
{provisionerCount} &mdash;{" "}
116122
{allProvisionersAreSameVersion ? (
@@ -123,9 +129,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
123129
)}
124130
{type === "key" && (
125131
<div css={{ lineHeight: "160%" }}>
126-
<h4 css={{ fontWeight: 500, margin: 0 }}>
127-
Key group &ndash; {keyName}
128-
</h4>
132+
<h4 css={styles.groupTitle}>Key group &ndash; {keyName}</h4>
129133
<span css={{ color: theme.palette.text.secondary }}>
130134
{provisionerCount} &mdash;{" "}
131135
{allProvisionersAreSameVersion ? (
@@ -191,7 +195,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
191195
]}
192196
>
193197
<div css={{ lineHeight: 1.6 }}>
194-
<h4 css={{ fontWeight: 500, margin: 0 }}>{provisioner.name}</h4>
198+
<h4 css={styles.groupTitle}>{provisioner.name}</h4>
195199
<span
196200
css={{ color: theme.palette.text.secondary, fontSize: 13 }}
197201
>
@@ -218,18 +222,21 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
218222
},
219223
}}
220224
>
221-
<h4 css={styles.title}>Release version</h4>
225+
<h4 css={styles.versionPopoverTitle}>
226+
Release version
227+
</h4>
222228
<p css={styles.text}>{provisioner.version}</p>
223-
<h4 css={styles.title}>Protocol version</h4>
229+
<h4 css={styles.versionPopoverTitle}>
230+
Protocol version
231+
</h4>
224232
<p css={styles.text}>{provisioner.api_version}</p>
225-
{provisioner.api_version !==
226-
buildInfo?.provisioner_api_version && (
233+
{provisioner.version !== buildInfo?.version && (
227234
<p css={[styles.text, { fontSize: 13 }]}>
228235
This provisioner is out of date. You may
229236
experience issues when using a provisioner version
230-
that doesnt match your Coder deployment. Please
231-
upgrade to a newer version.{" "}
232-
<Link href={docs("/")}>Learn more</Link>
237+
that doesn&apos;t match your Coder deployment.
238+
Please upgrade to a newer version.{" "}
239+
<Link href={docs("/")}>Learn more&hellip;</Link>
233240
</p>
234241
)}
235242
</PopoverContent>
@@ -289,8 +296,54 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
289296
);
290297
};
291298

299+
const BuiltinProvisionerTitle: FC = () => {
300+
return (
301+
<h4 css={styles.groupTitle}>
302+
<Stack direction="row" alignItems="end" spacing={1}>
303+
<span>Built-in provisioners</span>
304+
<HelpTooltip>
305+
<HelpTooltipTrigger />
306+
<HelpTooltipContent>
307+
<HelpTooltipTitle>Built-in provisioners</HelpTooltipTitle>
308+
<HelpTooltipText>
309+
These provisioners are running as part of a coderd instance.
310+
Built-in provisioners are only available for the default
311+
organization. <Link href={docs("/")}>Learn more&hellip;</Link>
312+
</HelpTooltipText>
313+
</HelpTooltipContent>
314+
</HelpTooltip>
315+
</Stack>
316+
</h4>
317+
);
318+
};
319+
const PskProvisionerTitle: FC = () => {
320+
return (
321+
<h4 css={styles.groupTitle}>
322+
<Stack direction="row" alignItems="end" spacing={1}>
323+
<span>PSK provisioners</span>
324+
<HelpTooltip>
325+
<HelpTooltipTrigger />
326+
<HelpTooltipContent>
327+
<HelpTooltipTitle>PSK provisioners</HelpTooltipTitle>
328+
<HelpTooltipText>
329+
These provisioners all use pre-shared key authentication. PSK
330+
provisioners are only available for the default organization.{" "}
331+
<Link href={docs("/")}>Learn more&hellip;</Link>
332+
</HelpTooltipText>
333+
</HelpTooltipContent>
334+
</HelpTooltip>
335+
</Stack>
336+
</h4>
337+
);
338+
};
339+
292340
const styles = {
293-
title: (theme) => ({
341+
groupTitle: {
342+
fontWeight: 500,
343+
margin: 0,
344+
},
345+
346+
versionPopoverTitle: (theme) => ({
294347
marginTop: 0,
295348
marginBottom: 0,
296349
color: theme.palette.text.primary,

0 commit comments

Comments
 (0)