display on fe

f0ssel · f0ssel · commit a2faf9f665a5 · 2024-09-30T18:50:38.000Z
diff --git a/site/src/modules/provisioners/ProvisionerGroup.tsx b/site/src/modules/provisioners/ProvisionerGroup.tsx
@@ -27,7 +27,7 @@ import { createDayString } from "utils/createDayString";
 import { docs } from "utils/docs";
 import { ProvisionerTag } from "./ProvisionerTag";
 
-type ProvisionerGroupType = "builtin" | "psk" | "key";
+type ProvisionerGroupType = "builtin" | "userAuth" | "psk" | "key";
 
 interface ProvisionerGroupProps {
 	readonly buildInfo: BuildInfoResponse;
@@ -62,7 +62,6 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
 		return null;
 	}
 
-	const daemonScope = firstProvisioner.tags.scope || "organization";
 	const allProvisionersAreSameVersion = provisioners.every(
 		(it) => it.version === firstProvisioner.version,
 	);
@@ -73,9 +72,6 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
 		provisioners.length === 1
 			? "1 provisioner"
 			: `${provisioners.length} provisioners`;
-	const extraTags = Object.entries(keyTags).filter(
-		([key]) => key !== "scope" && key !== "owner",
-	);
 
 	let warnings = 0;
 	let provisionersWithWarnings = 0;
@@ -102,9 +98,6 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
 			? "1 provisioner"
 			: `${provisionersWithWarnings} provisioners`;
 
-	const hasMultipleTagVariants =
-		type === "psk" && provisioners.some((it) => !isSimpleTagSet(it.tags));
-
 	return (
 		<div
 			css={[
@@ -142,6 +135,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
 								</span>
 							</>
 						)}
+						{type === "userAuth" && <UserAuthProvisionerTitle />}
 
 						{type === "psk" && <PskProvisionerTitle />}
 						{type === "key" && (
@@ -168,28 +162,8 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
 						justifyContent: "right",
 					}}
 				>
-					{!hasMultipleTagVariants ? (
-						<Tooltip title="Scope">
-							<Pill
-								size="lg"
-								icon={
-									daemonScope === "organization" ? (
-										<BusinessIcon />
-									) : (
-										<PersonIcon />
-									)
-								}
-							>
-								<span css={{ textTransform: "capitalize" }}>{daemonScope}</span>
-							</Pill>
-						</Tooltip>
-					) : (
-						<Pill size="lg" icon={<TagIcon />}>
-							Multiple tags
-						</Pill>
-					)}
 					{type === "key" &&
-						extraTags.map(([key, value]) => (
+						Object.entries(keyTags).map(([key, value]) => (
 							<ProvisionerTag key={key} tagName={key} tagValue={value} />
 						))}
 				</div>
@@ -248,9 +222,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
 										)}
 									</span>
 								</div>
-								{hasMultipleTagVariants && (
-									<PskProvisionerTags tags={provisioner.tags} />
-								)}
+								<PskProvisionerTags tags={provisioner.tags} />
 							</Stack>
 						</div>
 					))}
@@ -413,6 +385,27 @@ const BuiltinProvisionerTitle: FC = () => {
 	);
 };
 
+const UserAuthProvisionerTitle: FC = () => {
+	return (
+		<h4 css={styles.groupTitle}>
+			<Stack direction="row" alignItems="end" spacing={1}>
+				<span>User provisioners</span>
+				<HelpTooltip>
+					<HelpTooltipTrigger />
+					<HelpTooltipContent>
+						<HelpTooltipTitle>User provisioners</HelpTooltipTitle>
+						<HelpTooltipText>
+							These provisioners all use user session authentication. User
+							provisioners can be scoped to the user or organization.{" "}
+							<Link href={docs("/")}>Learn more&hellip;</Link>
+						</HelpTooltipText>
+					</HelpTooltipContent>
+				</HelpTooltip>
+			</Stack>
+		</h4>
+	);
+};
+
 const PskProvisionerTitle: FC = () => {
 	return (
 		<h4 css={styles.groupTitle}>
diff --git a/site/src/pages/ManagementSettingsPage/OrganizationProvisionersPageView.tsx b/site/src/pages/ManagementSettingsPage/OrganizationProvisionersPageView.tsx
@@ -113,13 +113,13 @@ const ViewContent: FC<ViewContentProps> = ({ buildInfo, provisioners }) => {
 				{provisioners.map((group) => {
 					const type = getGroupType(group.key);
 
-					// We intentionally hide user-authenticated provisioners for now
-					// because there are 1. some grouping issues on the backend and 2. we
-					// should ideally group them by the user who authenticated them, and
-					// not just lump them all together.
-					if (type === "userAuth") {
-						return null;
-					}
+					// // We intentionally hide user-authenticated provisioners for now
+					// // because there are 1. some grouping issues on the backend and 2. we
+					// // should ideally group them by the user who authenticated them, and
+					// // not just lump them all together.
+					// if (type === "userAuth") {
+					// 	return null;
+					// }
 
 					return (
 						<ProvisionerGroup
