pr comments

f0ssel · f0ssel · commit 07b2241edd9f · 2024-01-17T19:31:05.000Z
diff --git a/site/src/components/Form/Form.tsx b/site/src/components/Form/Form.tsx
@@ -70,7 +70,7 @@ export const VerticalForm: FC<HTMLProps<HTMLFormElement>> = ({
 export const FormSection: FC<
   PropsWithChildren & {
     title: string | JSX.Element;
-    description: string | JSX.Element | undefined;
+    description: string | JSX.Element;
     classes?: {
       root?: string;
       sectionInfo?: string;
diff --git a/site/src/pages/HealthPage/Content.tsx b/site/src/pages/HealthPage/Content.tsx
@@ -170,7 +170,7 @@ export const Pill = forwardRef<HTMLDivElement, PillProps>((props, ref) => {
         border: `1px solid ${theme.palette.divider}`,
         fontSize: 12,
         fontWeight: 500,
-        padding: "8px 8px 8px 8px",
+        padding: 8,
         gap: 8,
         cursor: "default",
       }}
diff --git a/site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx b/site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx
@@ -22,7 +22,6 @@ import SwapHoriz from "@mui/icons-material/SwapHoriz";
 import Tooltip from "@mui/material/Tooltip";
 import Sell from "@mui/icons-material/Sell";
 import { FC } from "react";
-import { additionalTags } from "utils/provisionertags";
 import CloseIcon from '@mui/icons-material/Close';
 import IconButton from "@mui/material/IconButton";
 
@@ -62,7 +61,15 @@ export const ProvisionerDaemonsPage = () => {
           const daemonScope = daemon.tags["scope"] || "organization";
           const iconScope =
             daemonScope === "organization" ? <Business /> : <Person />;
-          const extraTags = additionalTags(daemon.tags)
+          const extraTags = Object.keys(daemon.tags)
+          .filter((key) => key !== "scope" && key !== "owner")
+          .reduce(
+            (acc, key) => {
+              acc[key] = daemon.tags[key];
+              return acc;
+            },
+            {} as Record<string, string>,
+          );
           const isWarning = warnings.length > 0;
           return (
             <div
@@ -193,25 +200,29 @@ interface ProvisionerTagProps {
 export const ProvisionerTag : FC<ProvisionerTagProps> = ({ k, v, onDelete}) => {
   const { valid, value: boolValue } = parseBool(v);
   const kv = `${k}: ${v}`;
-  const content = (
+  const content = onDelete ? (
     <>
-      {onDelete ? (
-        <>
-          {kv}
-          <IconButton aria-label="delete" size="small" color="secondary" onClick={() => {
-            onDelete(k)
-          }}>
-            <CloseIcon fontSize="inherit" css={{
-              width: 14,
-              height: 14,
-            }}/>
-          </IconButton>
-          </>
-      ) : (
-        <>{kv}</>
-      )}
+      {kv}
+      <IconButton
+        aria-label="delete"
+        size="small"
+        color="secondary"
+        onClick={() => {
+          onDelete(k);
+        }}
+      >
+        <CloseIcon
+          fontSize="inherit"
+          css={{
+            width: 14,
+            height: 14,
+          }}
+        />
+      </IconButton>
     </>
-  )
+  ) : (
+    kv
+  );
   if (valid) {
     return <BooleanPill value={boolValue}>{content}</BooleanPill>;
   }
diff --git a/site/src/pages/TemplateVersionEditorPage/ProvisionerTagsPopover.tsx b/site/src/pages/TemplateVersionEditorPage/ProvisionerTagsPopover.tsx
@@ -54,10 +54,9 @@ export const ProviderTagsPopover: FC<ProviderTagsPopoverProps> = ({ tags, onSubm
   const getFieldHelpers = getFormHelpers(form);
 
   return (
-    <Popover isDefaultOpen={false}>
+    <Popover>
     <PopoverTrigger>
       <TopbarButton
-        data-testid="build-parameters-button"
         color="neutral"
         css={{ paddingLeft: 0, paddingRight: 0, minWidth: "28px !important" }}
       >
@@ -76,7 +75,6 @@ export const ProviderTagsPopover: FC<ProviderTagsPopoverProps> = ({ tags, onSubm
         }}
       >
         <VerticalForm onSubmit={form.handleSubmit}>
-
           <Stack>
           <FormSection title="Provisioner Tags" description="Tags are a way to control which provisoner daemons process which build jobs. To learn more read the docs. "/>
             {Object.keys(tags).length > 0 && (
