fix: avoid showing "multiple tags" for simple tag sets on provisioners page (#14804)

aslilac · web-flow · commit 2cffb5545706 · 2024-09-25T12:48:34.000-06:00
diff --git a/site/src/modules/provisioners/ProvisionerGroup.tsx b/site/src/modules/provisioners/ProvisionerGroup.tsx
@@ -22,7 +22,6 @@ import {
 } from "components/Popover/Popover";
 import { Stack } from "components/Stack/Stack";
 import { StatusIndicator } from "components/StatusIndicator/StatusIndicator";
-import isEqual from "lodash/isEqual";
 import { type FC, useState } from "react";
 import { createDayString } from "utils/createDayString";
 import { docs } from "utils/docs";
@@ -38,6 +37,15 @@ interface ProvisionerGroupProps {
 	readonly provisioners: readonly ProvisionerDaemon[];
 }
 
+function isSimpleTagSet(tags: Record<string, string>) {
+	const numberOfExtraTags = Object.keys(tags).filter(
+		(key) => key !== "scope" && key !== "owner",
+	).length;
+	return (
+		numberOfExtraTags === 0 && tags.scope === "organization" && !tags.owner
+	);
+}
+
 export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
 	buildInfo,
 	keyName,
@@ -95,8 +103,7 @@ export const ProvisionerGroup: FC<ProvisionerGroupProps> = ({
 			: `${provisionersWithWarnings} provisioners`;
 
 	const hasMultipleTagVariants =
-		type === "psk" &&
-		provisioners.some((it) => !isEqual(it.tags, { scope: "organization" }));
+		type === "psk" && provisioners.some((it) => !isSimpleTagSet(it.tags));
 
 	return (
 		<div
diff --git a/site/src/pages/ManagementSettingsPage/OrganizationProvisionersPageView.stories.tsx b/site/src/pages/ManagementSettingsPage/OrganizationProvisionersPageView.stories.tsx
@@ -44,7 +44,10 @@ export const Provisioners: Story = {
 			},
 			{
 				key: { ...MockProvisionerKey, id: "ジェイデン", name: "ジェイデン" },
-				daemons: [MockProvisioner, MockProvisioner2],
+				daemons: [
+					MockProvisioner,
+					{ ...MockProvisioner2, tags: { scope: "organization", owner: "" } },
+				],
 			},
 			{
 				key: { ...MockProvisionerKey, id: "ベン", name: "ベン" },

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,10 @@ export const Provisioners: Story = {`
`44`	`44`	`},`
`45`	`45`	`{`
`46`	`46`	`key: { ...MockProvisionerKey, id: "ジェイデン", name: "ジェイデン" },`
`47`		`- daemons: [MockProvisioner, MockProvisioner2],`
	`47`	`+ daemons: [`
	`48`	`+ MockProvisioner,`
	`49`	`+ { ...MockProvisioner2, tags: { scope: "organization", owner: "" } },`
	`50`	`+ ],`
`48`	`51`	`},`
`49`	`52`	`{`
`50`	`53`	`key: { ...MockProvisionerKey, id: "ベン", name: "ベン" },`