Fmt and fix e2e test

ammario · ammario · commit 460eb870dcd8 · 2024-01-21T21:22:09.000-06:00
diff --git a/site/e2e/parameters.ts b/site/e2e/parameters.ts
@@ -130,8 +130,8 @@ export const seventhParameter: RichParameter = {
 
 // randParamName returns a new parameter with a random name.
 export const randParamName = (p: RichParameter): RichParameter => {
-  p.name += Math.random().toString(36).substring(7);
-  return p;
+  const name = p.name + Math.random().toString(36).substring(7);
+  return { ...p, name: name };
 };
 
 // Build options
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/components/RichParameterInput/RichParameterInput.tsx b/site/src/components/RichParameterInput/RichParameterInput.tsx
@@ -159,7 +159,7 @@ export const RichParameterInput: FC<RichParameterInputProps> = ({
       <ParameterLabel parameter={parameter} />
       <div css={{ display: "flex", flexDirection: "column" }}>
         <RichParameterField {...fieldProps} size={size} parameter={parameter} />
-        {autofillSource && (
+        {autofillSource && autofillSource !== "active_build" && (
           <div css={{ marginTop: 4, fontSize: 12 }}>
             🪄 Autofilled:{" "}
             {
diff --git a/site/src/components/TemplateParameters/TemplateParameters.tsx b/site/src/components/TemplateParameters/TemplateParameters.tsx
@@ -9,7 +9,7 @@ import { AutofillSource } from "utils/richParameters";
 
 export type TemplateParametersSectionProps = {
   templateParameters: TemplateVersionParameter[];
-  defaultReasons?: Record<string, AutofillSource>;
+  autofillSources?: Record<string, AutofillSource>;
   getInputProps: (
     parameter: TemplateVersionParameter,
     index: number,
@@ -21,7 +21,7 @@ export const MutableTemplateParametersSection: FC<
 > = ({
   templateParameters,
   getInputProps,
-  defaultReasons,
+  autofillSources: defaultReasons,
   ...formSectionProps
 }) => {
   const hasMutableParameters =
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -127,7 +127,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
     error,
   );
 
-  const defaultSources = useMemo(() => {
+  const autofillSources = useMemo(() => {
     return autofillParameters.reduce(
       (acc, param) => {
         acc[param.name] = param.source;
@@ -223,7 +223,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
         {parameters && (
           <>
             <MutableTemplateParametersSection
-              defaultReasons={defaultSources}
+              autofillSources={autofillSources}
               templateParameters={parameters}
               getInputProps={(parameter, index) => {
                 return {
@@ -244,7 +244,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
               }}
             />
             <ImmutableTemplateParametersSection
-              defaultReasons={defaultSources}
+              autofillSources={autofillSources}
               templateParameters={parameters}
               classes={{
                 root: css`
diff --git a/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx b/site/src/pages/WorkspacePage/WorkspaceActions/BuildParametersPopover.tsx
@@ -21,7 +21,10 @@ import {
 import { useFormik } from "formik";
 import { docs } from "utils/docs";
 import { getFormHelpers } from "utils/formUtils";
-import { getInitialRichParameterValues } from "utils/richParameters";
+import {
+  AutofillBuildParameter,
+  getInitialRichParameterValues,
+} from "utils/richParameters";
 import {
   Popover,
   PopoverContent,
@@ -113,7 +116,12 @@ const BuildParametersPopoverContent: FC<BuildParametersPopoverContentProps> = ({
                   popover.setIsOpen(false);
                 }}
                 ephemeralParameters={ephemeralParameters}
-                buildParameters={buildParameters}
+                buildParameters={buildParameters.map(
+                  (p): AutofillBuildParameter => ({
+                    ...p,
+                    source: "active_build",
+                  }),
+                )}
               />
             </div>
           </>
@@ -147,7 +155,7 @@ const BuildParametersPopoverContent: FC<BuildParametersPopoverContentProps> = ({
 
 interface FormProps {
   ephemeralParameters: TemplateVersionParameter[];
-  buildParameters: WorkspaceBuildParameter[];
+  buildParameters: AutofillBuildParameter[];
   onSubmit: (buildParameters: WorkspaceBuildParameter[]) => void;
 }
 
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersForm.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersForm.tsx
@@ -10,6 +10,7 @@ import {
 } from "components/Form/Form";
 import { RichParameterInput } from "components/RichParameterInput/RichParameterInput";
 import {
+  AutofillBuildParameter,
   getInitialRichParameterValues,
   useValidationSchemaForRichParameters,
 } from "utils/richParameters";
@@ -27,7 +28,7 @@ export type WorkspaceParametersFormValues = {
 interface WorkspaceParameterFormProps {
   workspace: Workspace;
   templateVersionRichParameters: TemplateVersionParameter[];
-  buildParameters: WorkspaceBuildParameter[];
+  autofillParams: AutofillBuildParameter[];
   isSubmitting: boolean;
   canChangeVersions: boolean;
   error: unknown;
@@ -40,7 +41,7 @@ export const WorkspaceParametersForm: FC<WorkspaceParameterFormProps> = ({
   onCancel,
   onSubmit,
   templateVersionRichParameters,
-  buildParameters,
+  autofillParams,
   error,
   canChangeVersions,
   isSubmitting,
@@ -50,7 +51,7 @@ export const WorkspaceParametersForm: FC<WorkspaceParameterFormProps> = ({
     initialValues: {
       rich_parameter_values: getInitialRichParameterValues(
         templateVersionRichParameters,
-        buildParameters,
+        autofillParams,
       ),
     },
     validationSchema: Yup.object({
diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx
@@ -24,6 +24,7 @@ import { EmptyState } from "components/EmptyState/EmptyState";
 import Button from "@mui/material/Button";
 import OpenInNewOutlined from "@mui/icons-material/OpenInNewOutlined";
 import { docs } from "utils/docs";
+import { AutofillBuildParameter } from "utils/richParameters";
 
 const WorkspaceParametersPage: FC = () => {
   const workspace = useWorkspaceSettings();
@@ -126,7 +127,12 @@ export const WorkspaceParametersPageView: FC<
           <WorkspaceParametersForm
             workspace={workspace}
             canChangeVersions={canChangeVersions}
-            buildParameters={data.buildParameters}
+            autofillParams={data.buildParameters.map(
+              (p): AutofillBuildParameter => ({
+                ...p,
+                source: "active_build",
+              }),
+            )}
             templateVersionRichParameters={data.templateVersionRichParameters}
             error={submitError}
             isSubmitting={isSubmitting}
diff --git a/site/src/utils/richParameters.ts b/site/src/utils/richParameters.ts
@@ -4,8 +4,10 @@ import {
 } from "api/typesGenerated";
 import * as Yup from "yup";
 
-export type AutofillSource = "user_history" | "url";
+export type AutofillSource = "user_history" | "url" | "active_build";
 
+// AutofillBuildParameter is a build parameter destined to a form, alongside
+// its source so that the form can explain where the value comes from.
 export type AutofillBuildParameter = {
   source: AutofillSource;
 } & WorkspaceBuildParameter;
@@ -19,21 +21,10 @@ export const getInitialRichParameterValues = (
       (p) => p.name === parameter.name,
     );
     if (autofillParam !== undefined && isValidValue(parameter, autofillParam)) {
-      // URL takes precedence over all other sources.
-      if (autofillParam.source === "url") {
-        return {
-          name: parameter.name,
-          value: autofillParam.value,
-        };
-      }
-
-      // Need to decide whether user_history is more important than default value.
-      if (autofillParam.source === "user_history") {
-        return {
-          name: parameter.name,
-          value: autofillParam.value,
-        };
-      }
+      return {
+        name: parameter.name,
+        value: autofillParam.value,
+      };
     }
 
     return {

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ export const RichParameterInput: FC<RichParameterInputProps> = ({`
`159`	`159`	`<ParameterLabel parameter={parameter} />`
`160`	`160`	`<div css={{ display: "flex", flexDirection: "column" }}>`
`161`	`161`	`<RichParameterField {...fieldProps} size={size} parameter={parameter} />`
`162`		`- {autofillSource && (`
	`162`	`+ {autofillSource && autofillSource !== "active_build" && (`
`163`	`163`	`<div css={{ marginTop: 4, fontSize: 12 }}>`
`164`	`164`	`🪄 Autofilled:{" "}`
`165`	`165`	`{`