- Notifications
You must be signed in to change notification settings - Fork928
feat: show tags for psk provisioners#14628
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
17 commits Select commitHold shift + click to select a range
665c9b3 work
aslilac4558b44 do the stuff
aslilacfcd8614 🧹
aslilac82c6362 feat: show more detailed provisioner version info
aslilac8bb49a7 🧹
aslilacdfa2621 descriptive lil help guys :)
aslilac55360f7 🧹
aslilac9129412 psk tags psk tags psk tags
aslilac401eab3 Merge branch 'main' into group-provisioners
aslilac716b257 hook up to api
aslilaca1b7cbd :)
aslilac5d6d312 Merge branch 'group-provisioners' into provisioner-version-popups
aslilac37e3933 v2.99.99
aslilac2c6fd6d Merge branch 'provisioner-version-popups' into provisioner-types
aslilacfd3b259 Merge branch 'provisioner-types' into psk-tags
aslilac1f8c386 tada
aslilaccc620a5 Merge branch 'main' into psk-tags
aslilacFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
204 changes: 139 additions & 65 deletionssite/src/modules/provisioners/ProvisionerGroup.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -134,13 +134,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({ | ||
| > | ||
| <Tooltip title="Scope"> | ||
| <Pill size="lg" icon={iconScope}> | ||
| <span css={{ textTransform: "capitalize" }}>{daemonScope}</span> | ||
| </Pill> | ||
| </Tooltip> | ||
| {type === "key" && | ||
| @@ -166,67 +160,45 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({ | ||
| borderRadius: 8, | ||
| border: `1px solid ${theme.palette.divider}`, | ||
| fontSize: 14, | ||
| padding: "14px 18px", | ||
| width:375, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Could the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I kinda don't want them to grow tho, and disrupt the "grid" | ||
| }} | ||
| > | ||
| <Stack | ||
| direction="row" | ||
| justifyContent="space-between" | ||
| alignItems="center" | ||
| > | ||
| <div css={{ lineHeight: 1.5 }}> | ||
| <h4 css={{ fontWeight: 500, margin: 0 }}> | ||
| {provisioner.name} | ||
| </h4> | ||
| <span | ||
| css={{ color: theme.palette.text.secondary, fontSize: 12 }} | ||
| > | ||
| {type === "builtin" ? ( | ||
| <span>Built-in</span> | ||
| ) : ( | ||
| <> | ||
| <ProvisionerVersionPopover | ||
| buildInfo={buildInfo} | ||
| provisioner={provisioner} | ||
| />{" "} | ||
| —{" "} | ||
| {provisioner.last_seen_at && ( | ||
| <span data-chromatic="ignore"> | ||
| Last seen{" "} | ||
| {createDayString(provisioner.last_seen_at)} | ||
| </span> | ||
| )} | ||
| </> | ||
| )} | ||
| </span> | ||
| </div> | ||
| {type === "psk" && ( | ||
| <PskProvisionerTags tags={provisioner.tags} /> | ||
| )} | ||
| </Stack> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| @@ -263,6 +235,107 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({ | ||
| ); | ||
| }; | ||
| interface ProvisionerVersionPopoverProps { | ||
| buildInfo?: BuildInfoResponse; | ||
| provisioner: ProvisionerDaemon; | ||
| } | ||
| const ProvisionerVersionPopover: FC<ProvisionerVersionPopoverProps> = ({ | ||
| buildInfo, | ||
| provisioner, | ||
| }) => { | ||
| return ( | ||
| <Popover mode="hover"> | ||
| <PopoverTrigger> | ||
| <span> | ||
| {buildInfo | ||
| ? provisioner.version === buildInfo.version | ||
| ? "Up to date" | ||
| : "Out of date" | ||
| : provisioner.version} | ||
| </span> | ||
| </PopoverTrigger> | ||
| <PopoverContent | ||
| transformOrigin={{ vertical: -8, horizontal: 0 }} | ||
| css={{ | ||
| "& .MuiPaper-root": { | ||
| padding: "20px 20px 8px", | ||
| maxWidth: 340, | ||
| }, | ||
| }} | ||
| > | ||
| <h4 css={styles.versionPopoverTitle}>Release version</h4> | ||
| <p css={styles.text}>{provisioner.version}</p> | ||
| <h4 css={styles.versionPopoverTitle}>Protocol version</h4> | ||
| <p css={styles.text}>{provisioner.api_version}</p> | ||
| {provisioner.api_version !== buildInfo?.provisioner_api_version && ( | ||
| <p css={[styles.text, { fontSize: 13 }]}> | ||
| This provisioner is out of date. You may experience issues when | ||
| using a provisioner version that doesn’t match your Coder | ||
| deployment. Please upgrade to a newer version.{" "} | ||
| <Link href={docs("/")}>Learn more…</Link> | ||
| </p> | ||
| )} | ||
| </PopoverContent> | ||
| </Popover> | ||
| ); | ||
| }; | ||
| interface PskProvisionerTagsProps { | ||
| tags: Record<string, string>; | ||
| } | ||
| const PskProvisionerTags: FC<PskProvisionerTagsProps> = ({ tags }) => { | ||
| const daemonScope = tags.scope || "organization"; | ||
| const iconScope = daemonScope === "organization" ? <Business /> : <Person />; | ||
| const extraTags = Object.entries(tags).filter( | ||
| ([tag]) => tag !== "scope" && tag !== "owner", | ||
| ); | ||
| if (extraTags.length === 0) { | ||
| return ( | ||
| <Pill icon={iconScope}> | ||
| <span css={{ textTransform: "capitalize" }}>{daemonScope}</span> | ||
| </Pill> | ||
| ); | ||
| } | ||
| return ( | ||
| <Popover mode="hover"> | ||
| <PopoverTrigger> | ||
| <Pill icon={iconScope}> | ||
| {extraTags.length === 1 ? "+ 1 tag" : `+ ${extraTags.length} tags`} | ||
| </Pill> | ||
| </PopoverTrigger> | ||
| <PopoverContent | ||
| transformOrigin={{ vertical: -8, horizontal: 0 }} | ||
| css={{ | ||
| "& .MuiPaper-root": { | ||
| padding: 20, | ||
| maxWidth: 340, | ||
| width: "fit-content", | ||
| }, | ||
| }} | ||
| > | ||
| <div | ||
| css={{ | ||
| marginLeft: "auto", | ||
| display: "flex", | ||
| flexWrap: "wrap", | ||
| gap: 12, | ||
| justifyContent: "right", | ||
| }} | ||
| > | ||
| {extraTags.map(([key, value]) => ( | ||
| <ProvisionerTag key={key} tagName={key} tagValue={value} /> | ||
| ))} | ||
| </div> | ||
| </PopoverContent> | ||
| </Popover> | ||
| ); | ||
| }; | ||
| const BuiltinProvisionerTitle: FC = () => { | ||
| return ( | ||
| <h4 css={styles.groupTitle}> | ||
| @@ -283,6 +356,7 @@ const BuiltinProvisionerTitle: FC = () => { | ||
| </h4> | ||
| ); | ||
| }; | ||
| const PskProvisionerTitle: FC = () => { | ||
| return ( | ||
| <h4 css={styles.groupTitle}> | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.