Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitde3945c

Browse files
authored
chore: add help tooltips explaining provisioner types (#14625)
* work* do the stuff* 🧹* feat: show more detailed provisioner version info* 🧹* descriptive lil help guys :)* 🧹* hook up to api* :)* v2.99.99
1 parentbbc7b50 commitde3945c

File tree

1 file changed

+71
-18
lines changed

1 file changed

+71
-18
lines changed

‎site/src/modules/provisioners/ProvisionerGroup.tsx

Lines changed: 71 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,20 @@ import Link from "@mui/material/Link";
66
importTooltipfrom"@mui/material/Tooltip";
77
importtype{BuildInfoResponse,ProvisionerDaemon}from"api/typesGenerated";
88
import{DropdownArrow}from"components/DropdownArrow/DropdownArrow";
9+
import{
10+
HelpTooltip,
11+
HelpTooltipContent,
12+
HelpTooltipText,
13+
HelpTooltipTitle,
14+
HelpTooltipTrigger,
15+
}from"components/HelpTooltip/HelpTooltip";
916
import{Pill}from"components/Pill/Pill";
1017
import{
1118
Popover,
1219
PopoverContent,
1320
PopoverTrigger,
1421
}from"components/Popover/Popover";
22+
import{Stack}from"components/Stack/Stack";
1523
import{typeFC,useState}from"react";
1624
import{createDayString}from"utils/createDayString";
1725
import{docs}from"utils/docs";
@@ -82,17 +90,15 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
8290
>
8391
{type==="builtin"&&(
8492
<divcss={{lineHeight:"160%"}}>
85-
<h4css={{fontWeight:500,margin:0}}>
86-
Built-in provisioners
87-
</h4>
93+
<BuiltinProvisionerTitle/>
8894
<spancss={{color:theme.palette.text.secondary}}>
8995
{provisionerCount} &mdash; Built-in
9096
</span>
9197
</div>
9298
)}
9399
{type==="psk"&&(
94100
<divcss={{lineHeight:"160%"}}>
95-
<h4css={{fontWeight:500,margin:0}}>PSK provisioners</h4>
101+
<PskProvisionerTitle/>
96102
<spancss={{color:theme.palette.text.secondary}}>
97103
{provisionerCount} &mdash;{" "}
98104
{allProvisionersAreSameVersion ?(
@@ -105,9 +111,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
105111
)}
106112
{type==="key"&&(
107113
<divcss={{lineHeight:"160%"}}>
108-
<h4css={{fontWeight:500,margin:0}}>
109-
Key group &ndash;{keyName}
110-
</h4>
114+
<h4css={styles.groupTitle}>Key group &ndash;{keyName}</h4>
111115
<spancss={{color:theme.palette.text.secondary}}>
112116
{provisionerCount} &mdash;{" "}
113117
{allProvisionersAreSameVersion ?(
@@ -167,7 +171,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
167171
}}
168172
>
169173
<divcss={{lineHeight:1.6}}>
170-
<h4css={{fontWeight:500,margin:0}}>{provisioner.name}</h4>
174+
<h4css={styles.groupTitle}>{provisioner.name}</h4>
171175
<span
172176
css={{color:theme.palette.text.secondary,fontSize:13}}
173177
>
@@ -194,18 +198,21 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
194198
},
195199
}}
196200
>
197-
<h4css={styles.title}>Release version</h4>
201+
<h4css={styles.versionPopoverTitle}>
202+
Release version
203+
</h4>
198204
<pcss={styles.text}>{provisioner.version}</p>
199-
<h4css={styles.title}>Protocol version</h4>
205+
<h4css={styles.versionPopoverTitle}>
206+
Protocol version
207+
</h4>
200208
<pcss={styles.text}>{provisioner.api_version}</p>
201-
{provisioner.api_version!==
202-
buildInfo?.provisioner_api_version&&(
209+
{provisioner.version!==buildInfo?.version&&(
203210
<pcss={[styles.text,{fontSize:13}]}>
204211
This provisioner is out of date. You may
205212
experience issues when using a provisioner version
206-
that doesn’t match your Coder deployment. Please
207-
upgrade to a newer version.{" "}
208-
<Linkhref={docs("/")}>Learn more…</Link>
213+
that doesn&apos;t match your Coder deployment.
214+
Pleaseupgrade to a newer version.{" "}
215+
<Linkhref={docs("/")}>Learn more&hellip;</Link>
209216
</p>
210217
)}
211218
</PopoverContent>
@@ -256,8 +263,54 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
256263
);
257264
};
258265

266+
constBuiltinProvisionerTitle:FC=()=>{
267+
return(
268+
<h4css={styles.groupTitle}>
269+
<Stackdirection="row"alignItems="end"spacing={1}>
270+
<span>Built-in provisioners</span>
271+
<HelpTooltip>
272+
<HelpTooltipTrigger/>
273+
<HelpTooltipContent>
274+
<HelpTooltipTitle>Built-in provisioners</HelpTooltipTitle>
275+
<HelpTooltipText>
276+
These provisioners are running as part of a coderd instance.
277+
Built-in provisioners are only available for the default
278+
organization.<Linkhref={docs("/")}>Learn more&hellip;</Link>
279+
</HelpTooltipText>
280+
</HelpTooltipContent>
281+
</HelpTooltip>
282+
</Stack>
283+
</h4>
284+
);
285+
};
286+
constPskProvisionerTitle:FC=()=>{
287+
return(
288+
<h4css={styles.groupTitle}>
289+
<Stackdirection="row"alignItems="end"spacing={1}>
290+
<span>PSK provisioners</span>
291+
<HelpTooltip>
292+
<HelpTooltipTrigger/>
293+
<HelpTooltipContent>
294+
<HelpTooltipTitle>PSK provisioners</HelpTooltipTitle>
295+
<HelpTooltipText>
296+
These provisioners all use pre-shared key authentication. PSK
297+
provisioners are only available for the default organization.{" "}
298+
<Linkhref={docs("/")}>Learn more&hellip;</Link>
299+
</HelpTooltipText>
300+
</HelpTooltipContent>
301+
</HelpTooltip>
302+
</Stack>
303+
</h4>
304+
);
305+
};
306+
259307
conststyles={
260-
title:(theme)=>({
308+
groupTitle:{
309+
fontWeight:500,
310+
margin:0,
311+
},
312+
313+
versionPopoverTitle:(theme)=>({
261314
marginTop:0,
262315
marginBottom:0,
263316
color:theme.palette.text.primary,
@@ -266,8 +319,8 @@ const styles = {
266319
fontWeight:600,
267320
}),
268321

269-
text:(theme)=>({
322+
text:{
270323
marginTop:0,
271324
marginBottom:12,
272-
}),
325+
},
273326
}satisfiesRecord<string,Interpolation<Theme>>;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp