diff --git a/site/src/modules/provisioners/ProvisionerGroup.tsx b/site/src/modules/provisioners/ProvisionerGroup.tsx index 9b9d3bb539..50dfb329ae 100644 --- a/site/src/modules/provisioners/ProvisionerGroup.tsx +++ b/site/src/modules/provisioners/ProvisionerGroup.tsx @@ -6,12 +6,20 @@ import Link from "@mui/material/Link"; import Tooltip from "@mui/material/Tooltip"; import type { BuildInfoResponse, ProvisionerDaemon } from "api/typesGenerated"; import { DropdownArrow } from "components/DropdownArrow/DropdownArrow"; +import { + HelpTooltip, + HelpTooltipContent, + HelpTooltipText, + HelpTooltipTitle, + HelpTooltipTrigger, +} from "components/HelpTooltip/HelpTooltip"; import { Pill } from "components/Pill/Pill"; import { Popover, PopoverContent, PopoverTrigger, } from "components/Popover/Popover"; +import { Stack } from "components/Stack/Stack"; import { type FC, useState } from "react"; import { createDayString } from "utils/createDayString"; import { docs } from "utils/docs"; @@ -82,9 +90,7 @@ export const ProvisionerGroup: FC = ({ > {type === "builtin" && (
-

- Built-in provisioners -

+ {provisionerCount} — Built-in @@ -92,7 +98,7 @@ export const ProvisionerGroup: FC = ({ )} {type === "psk" && (
-

PSK provisioners

+ {provisionerCount} —{" "} {allProvisionersAreSameVersion ? ( @@ -105,9 +111,7 @@ export const ProvisionerGroup: FC = ({ )} {type === "key" && (
-

- Key group – {keyName} -

+

Key group – {keyName}

{provisionerCount} —{" "} {allProvisionersAreSameVersion ? ( @@ -167,7 +171,7 @@ export const ProvisionerGroup: FC = ({ }} >
-

{provisioner.name}

+

{provisioner.name}

@@ -194,18 +198,21 @@ export const ProvisionerGroup: FC = ({ }, }} > -

Release version

+

+ Release version +

{provisioner.version}

-

Protocol version

+

+ Protocol version +

{provisioner.api_version}

- {provisioner.api_version !== - buildInfo?.provisioner_api_version && ( + {provisioner.version !== buildInfo?.version && (

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.{" "} - Learn more… + that doesn't match your Coder deployment. + Please upgrade to a newer version.{" "} + Learn more…

)} @@ -256,8 +263,54 @@ export const ProvisionerGroup: FC = ({ ); }; +const BuiltinProvisionerTitle: FC = () => { + return ( +

+ + Built-in provisioners + + + + Built-in provisioners + + These provisioners are running as part of a coderd instance. + Built-in provisioners are only available for the default + organization. Learn more… + + + + +

+ ); +}; +const PskProvisionerTitle: FC = () => { + return ( +

+ + PSK provisioners + + + + PSK provisioners + + These provisioners all use pre-shared key authentication. PSK + provisioners are only available for the default organization.{" "} + Learn more… + + + + +

+ ); +}; + const styles = { - title: (theme) => ({ + groupTitle: { + fontWeight: 500, + margin: 0, + }, + + versionPopoverTitle: (theme) => ({ marginTop: 0, marginBottom: 0, color: theme.palette.text.primary, @@ -266,8 +319,8 @@ const styles = { fontWeight: 600, }), - text: (theme) => ({ + text: { marginTop: 0, marginBottom: 12, - }), + }, } satisfies Record>;