Skip to content

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.

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 17 commits into from
Sep 17, 2024
Merged

feat: show tags for psk provisioners #14628

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
665c9b3
work
aslilac Sep 5, 2024
4558b44
do the stuff
aslilac Sep 6, 2024
fcd8614
🧹
aslilac Sep 6, 2024
82c6362
feat: show more detailed provisioner version info
aslilac Sep 6, 2024
8bb49a7
🧹
aslilac Sep 6, 2024
dfa2621
descriptive lil help guys :)
aslilac Sep 9, 2024
55360f7
🧹
aslilac Sep 9, 2024
9129412
psk tags psk tags psk tags
aslilac Sep 9, 2024
401eab3
Merge branch 'main' into group-provisioners
aslilac Sep 17, 2024
716b257
hook up to api
aslilac Sep 17, 2024
a1b7cbd
:)
aslilac Sep 17, 2024
5d6d312
Merge branch 'group-provisioners' into provisioner-version-popups
aslilac Sep 17, 2024
37e3933
v2.99.99
aslilac Sep 17, 2024
2c6fd6d
Merge branch 'provisioner-version-popups' into provisioner-types
aslilac Sep 17, 2024
fd3b259
Merge branch 'provisioner-types' into psk-tags
aslilac Sep 17, 2024
1f8c386
tada
aslilac Sep 17, 2024
cc620a5
Merge branch 'main' into psk-tags
aslilac Sep 17, 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
psk tags psk tags psk tags
  • Loading branch information
@aslilac
aslilac committed Sep 9, 2024
commit 91294121153d9e40e6a41fadd412ae46c968b054
200 changes: 139 additions & 61 deletions site/src/modules/provisioners/ProvisionerGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "components/Popover/Popover";
import { Stack } from "components/Stack/Stack";
import type { ProvisionerDaemonWithWarnings } from "pages/ManagementSettingsPage/OrganizationProvisionersPageView";
import { type FC, useState } from "react";
import { createDayString } from "utils/createDayString";
Expand Down Expand Up @@ -45,11 +46,6 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
const allProvisionersAreSameVersion = provisioners.every(
(provisioner) => provisioner.version === provisionerVersion,
);
const upToDate =
allProvisionersAreSameVersion && buildInfo?.version === provisioner.version;
const protocolUpToDate =
allProvisionersAreSameVersion &&
buildInfo?.provisioner_api_version === provisioner.api_version;
const provisionerCount =
provisioners.length === 1
? "1 provisioner"
Expand Down Expand Up @@ -150,7 +146,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
<Pill size="lg" icon={iconScope}>
<span
css={{
":first-letter": { textTransform: "uppercase" },
textTransform: "capitalize",
}}
>
{daemonScope}
Expand Down Expand Up @@ -181,69 +177,50 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
borderRadius: 8,
border: `1px solid ${theme.palette.divider}`,
fontSize: 14,
padding: "12px 18px",
width: 310,
padding: "14px 18px",
width: 375,
},
provisioner.warnings &&
provisioner.warnings.length > 0 && {
borderColor: theme.roles.warning.fill.outline,
},
]}
>
<div css={{ lineHeight: 1.6 }}>
<h4 css={{ fontWeight: 500, margin: 0 }}>{provisioner.name}</h4>
<span
css={{ color: theme.palette.text.secondary, fontSize: 13 }}
>
{type === "builtin" ? (
<span>Built-in</span>
) : (
<>
<Popover mode="hover">
<PopoverTrigger>
<span>
{buildInfo
? provisioner.version === buildInfo.version
? "Up to date"
: "Out of date"
: provisioner.version}
<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}
/>{" "}
&mdash;{" "}
{provisioner.last_seen_at && (
<span data-chromatic="ignore">
Last seen{" "}
{createDayString(provisioner.last_seen_at)}
</span>
</PopoverTrigger>
<PopoverContent
transformOrigin={{ vertical: -8, horizontal: 0 }}
css={{
"& .MuiPaper-root": {
padding: "20px 20px 8px",
maxWidth: 340,
},
}}
>
<h4 css={styles.title}>Release version</h4>
<p css={styles.text}>{provisioner.version}</p>
<h4 css={styles.title}>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>{" "}
&mdash;{" "}
{provisioner.last_seen_at && (
<span data-chromatic="ignore">
Last seen {createDayString(provisioner.last_seen_at)}
</span>
)}
</>
)}
</span>
</div>
)}
</>
)}
</span>
</div>
{type === "psk" && (
<PskProvisionerTags tags={provisioner.tags} />
)}
</Stack>
</div>
))}
</div>
Expand Down Expand Up @@ -289,6 +266,107 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
);
};

interface ProvisionerVersionPopoverProps {
buildInfo?: BuildInfoResponse;
provisioner: ProvisionerDaemonWithWarnings;
}

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.title}>Release version</h4>
<p css={styles.text}>{provisioner.version}</p>
<h4 css={styles.title}>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 styles = {
title: (theme) => ({
marginTop: 0,
Expand Down