Merge branch 'main' into no-sx

aslilac · aslilac · commit 2fbd6ea67b11 · 2023-11-16T23:38:10.000Z
diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
@@ -16,7 +16,7 @@ import {
   RichParameter,
 } from "./provisionerGenerated";
 import { prometheusPort, pprofPort } from "./constants";
-import { port } from "./playwright.config";
+import { port, TEST_TIMEOUT } from "./playwright.config";
 import * as ssh from "ssh2";
 import { Duplex } from "stream";
 import { WorkspaceBuildParameter } from "api/typesGenerated";
@@ -197,6 +197,7 @@ export const stopWorkspace = async (page: Page, workspaceName: string) => {
     "span[data-testid='build-status'] >> text=Stopped",
     {
       state: "visible",
+      timeout: TEST_TIMEOUT * 2,
     },
   );
 };
diff --git a/site/e2e/playwright.config.ts b/site/e2e/playwright.config.ts
@@ -12,6 +12,8 @@ const coderMain = path.join(__dirname, "../../enterprise/cmd/coder");
 
 export const STORAGE_STATE = path.join(__dirname, ".auth.json");
 
+export const TEST_TIMEOUT = 60_000;
+
 const localURL = (port: number, path: string): string => {
   return `http://localhost:${port}${path}`;
 };
@@ -29,7 +31,7 @@ export default defineConfig({
       use: {
         storageState: STORAGE_STATE,
       },
-      timeout: 60000,
+      timeout: TEST_TIMEOUT,
     },
   ],
   reporter: [["./reporter.ts"]],
diff --git a/site/src/pages/GroupsPage/CreateGroupPageView.tsx b/site/src/pages/GroupsPage/CreateGroupPageView.tsx
@@ -7,15 +7,11 @@ import { Stack } from "components/Stack/Stack";
 import { useFormik } from "formik";
 import { FC } from "react";
 import { useNavigate } from "react-router-dom";
-import {
-  getFormHelpers,
-  nameValidator,
-  onChangeTrimmed,
-} from "utils/formUtils";
+import { getFormHelpers, onChangeTrimmed } from "utils/formUtils";
 import * as Yup from "yup";
 
 const validationSchema = Yup.object({
-  name: nameValidator("Name"),
+  name: Yup.string().required().label("Name"),
 });
 
 export type CreateGroupPageViewProps = {
@@ -50,8 +46,6 @@ export const CreateGroupPageView: FC<CreateGroupPageViewProps> = ({
           <Stack spacing={2.5}>
             <TextField
               {...getFieldHelpers("name")}
-              onChange={onChangeTrimmed(form)}
-              autoComplete="name"
               autoFocus
               fullWidth
               label="Name"
@@ -61,8 +55,6 @@ export const CreateGroupPageView: FC<CreateGroupPageViewProps> = ({
                 "display_name",
                 "Optional: keep empty to default to the name.",
               )}
-              autoComplete="display_name"
-              autoFocus
               fullWidth
               label="Display Name"
             />
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx
@@ -40,6 +40,14 @@ export const BuildParametersPopover: FC<BuildParametersPopoverProps> = ({
   disabled,
   onSubmit,
 }) => {
+  const { data: parameters } = useQuery({
+    queryKey: ["workspace", workspace.id, "parameters"],
+    queryFn: () => getWorkspaceParameters(workspace),
+  });
+  const ephemeralParameters = parameters
+    ? parameters.templateVersionRichParameters.filter((p) => p.ephemeral)
+    : undefined;
+
   return (
     <Popover>
       <PopoverTrigger>
@@ -57,7 +65,8 @@ export const BuildParametersPopover: FC<BuildParametersPopoverProps> = ({
         css={{ ".MuiPaper-root": { width: 304 } }}
       >
         <BuildParametersPopoverContent
-          workspace={workspace}
+          ephemeralParameters={ephemeralParameters}
+          buildParameters={parameters?.buildParameters}
           onSubmit={onSubmit}
         />
       </PopoverContent>
@@ -66,28 +75,22 @@ export const BuildParametersPopover: FC<BuildParametersPopoverProps> = ({
 };
 
 interface BuildParametersPopoverContentProps {
-  workspace: Workspace;
+  ephemeralParameters?: TemplateVersionParameter[];
+  buildParameters?: WorkspaceBuildParameter[];
   onSubmit: (buildParameters: WorkspaceBuildParameter[]) => void;
 }
 
 const BuildParametersPopoverContent: FC<BuildParametersPopoverContentProps> = ({
-  workspace,
+  ephemeralParameters,
+  buildParameters,
   onSubmit,
 }) => {
   const theme = useTheme();
   const popover = usePopover();
-  const { data: parameters } = useQuery({
-    queryKey: ["workspace", workspace.id, "parameters"],
-    queryFn: () => getWorkspaceParameters(workspace),
-    enabled: popover.isOpen,
-  });
-  const ephemeralParameters = parameters
-    ? parameters.templateVersionRichParameters.filter((p) => p.ephemeral)
-    : undefined;
 
   return (
     <>
-      {parameters && parameters.buildParameters && ephemeralParameters ? (
+      {buildParameters && ephemeralParameters ? (
         ephemeralParameters.length > 0 ? (
           <>
             <div
@@ -109,7 +112,7 @@ const BuildParametersPopoverContent: FC<BuildParametersPopoverContentProps> = ({
                   popover.setIsOpen(false);
                 }}
                 ephemeralParameters={ephemeralParameters}
-                buildParameters={parameters.buildParameters}
+                buildParameters={buildParameters}
               />
             </div>
           </>
diff --git a/site/src/theme/colors.ts b/site/src/theme/colors.ts
@@ -4,17 +4,17 @@ export const colors = {
   white: "#fff",
 
   gray: {
-    17: tw.gray[950],
-    16: tw.gray[900],
-    14: tw.gray[800],
-    13: tw.gray[700],
-    12: tw.gray[600],
-    11: tw.gray[500],
-    9: tw.gray[400],
-    6: tw.gray[300],
-    4: tw.gray[200],
-    2: tw.gray[100],
-    1: tw.gray[50],
+    17: tw.zinc[950],
+    16: tw.zinc[900],
+    14: tw.zinc[800],
+    13: tw.zinc[700],
+    12: tw.zinc[600],
+    11: tw.zinc[500],
+    9: tw.zinc[400],
+    6: tw.zinc[300],
+    4: tw.zinc[200],
+    2: tw.zinc[100],
+    1: tw.zinc[50],
   },
 
   red: {
