make fmt

coder · mtojek · Feb 1, 2023 · Jan 24, 2023 · Jan 24, 2023 · Jan 25, 2023
commit dc79db51be46d3b427a34a2cbed57e1750713066
diff --git a/site/src/components/RichParameterInput/RichParameterInput.tsx b/site/src/components/RichParameterInput/RichParameterInput.tsx
@@ -11,7 +11,9 @@ const isBoolean = (parameter: TemplateVersionParameter) => {
   return parameter.type === "bool"
 }
 
-const ParameterLabel: React.FC<{ parameter: TemplateVersionParameter }> = ({ parameter }) => {
+const ParameterLabel: React.FC<{ parameter: TemplateVersionParameter }> = ({
+  parameter,
+}) => {
   const styles = useStyles()
 
   if (parameter.name && parameter.description) {
@@ -28,8 +30,8 @@ const ParameterLabel: React.FC<{ parameter: TemplateVersionParameter }> = ({ par
                   pointerEvents: "none",
                 }}
               />
-              </span>
-            )}
+            </span>
+          )}
           <span className={styles.labelName}>{parameter.name}</span>
         </span>
         <span className={styles.labelDescription}>{parameter.description}</span>
@@ -80,7 +82,7 @@ const RichParameterField: React.FC<RichParameterInputProps> = ({
   ...props
 }) => {
   const [parameterValue, setParameterValue] = useState(parameter.default_value)
-  const styles = useStyles();
+  const styles = useStyles()
 
   if (isBoolean(parameter)) {
     return (
@@ -114,31 +116,29 @@ const RichParameterField: React.FC<RichParameterInputProps> = ({
           onChange(event.target.value)
         }}
       >
-        {
-          parameter.options.map((option) => (
-            <FormControlLabel
-              disabled={disabled}
-              key={option.name}
-              value={option.value}
-              control={<Radio color="primary" size="small" disableRipple />}
-              label={(
-                <span>
-                  {option.icon && (
-                    <img
-                      className={styles.optionIcon}
-                      alt="Parameter icon"
-                      src={option.icon}
-                      style={{
-                        pointerEvents: "none",
-                      }}
-                    />
-                  )}
-                  {option.name}
-                </span>
-              )}
-            />
-          ))
-        }
+        {parameter.options.map((option) => (
+          <FormControlLabel
+            disabled={disabled}
+            key={option.name}
+            value={option.value}
+            control={<Radio color="primary" size="small" disableRipple />}
+            label={
+              <span>
+                {option.icon && (
+                  <img
+                    className={styles.optionIcon}
+                    alt="Parameter icon"
+                    src={option.icon}
+                    style={{
+                      pointerEvents: "none",
+                    }}
+                  />
+                )}
+                {option.name}
+              </span>
+            }
+          />
+        ))}
       </RadioGroup>
     )
   }

diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -62,7 +62,9 @@ export const CreateWorkspacePageView: FC<
         template_id: props.selectedTemplate ? props.selectedTemplate.id : "",
         rich_parameter_values: defaultRichParameters(props.templateParameters),
       },
-      validationSchema: ValidationSchemaForRichParameters(props.templateParameters),
+      validationSchema: ValidationSchemaForRichParameters(
+        props.templateParameters,
+      ),
       enableReinitialize: true,
       initialTouched: props.initialTouched,
       onSubmit: (request) => {
@@ -251,7 +253,9 @@ export const CreateWorkspacePageView: FC<
           {props.templateParameters && props.templateParameters.length > 0 && (
             <div className={styles.formSection}>
               <div className={styles.formSectionInfo}>
-                <h2 className={styles.formSectionInfoTitle}>Rich template params</h2>
+                <h2 className={styles.formSectionInfoTitle}>
+                  Rich template params
+                </h2>
                 <p className={styles.formSectionInfoDescription}>
                   Those values are provided by your template&lsquo;s Terraform
                   configuration.
@@ -265,14 +269,16 @@ export const CreateWorkspacePageView: FC<
               >
                 {props.templateParameters.map((parameter, index) => (
                   <RichParameterInput
-                    {...getFieldHelpers("rich_parameter_values[" + index + "].value")}
+                    {...getFieldHelpers(
+                      "rich_parameter_values[" + index + "].value",
+                    )}
                     disabled={form.isSubmitting}
                     key={parameter.name}
                     onChange={(value) => {
                       form.setFieldValue("rich_parameter_values." + index, {
                         name: parameter.name,
                         value: value,
-                      });
+                      })
                     }}
                     parameter={parameter}
                   />
@@ -364,8 +370,10 @@ const useFormFooterStyles = makeStyles((theme) => ({
   },
 }))
 
-const defaultRichParameters = (templateParameters?: TypesGen.TemplateVersionParameter[]): TypesGen.WorkspaceBuildParameter[] => {
-  const defaults: TypesGen.WorkspaceBuildParameter[] = [];
+const defaultRichParameters = (
+  templateParameters?: TypesGen.TemplateVersionParameter[],
+): TypesGen.WorkspaceBuildParameter[] => {
+  const defaults: TypesGen.WorkspaceBuildParameter[] = []
   if (!templateParameters) {
     return defaults
   }
@@ -382,14 +390,16 @@ const defaultRichParameters = (templateParameters?: TypesGen.TemplateVersionPara
 
     const buildParameter: TypesGen.WorkspaceBuildParameter = {
       name: parameter.name,
-      value: parameter.default_value || '',
+      value: parameter.default_value || "",
     }
     defaults.push(buildParameter)
   })
-  return defaults;
+  return defaults
 }
 
-const ValidationSchemaForRichParameters = (templateParameters?: TypesGen.TemplateVersionParameter[]): Yup.AnySchema => {
+const ValidationSchemaForRichParameters = (
+  templateParameters?: TypesGen.TemplateVersionParameter[],
+): Yup.AnySchema => {
   const { t } = useTranslation("createWorkspacePage")
 
   if (!templateParameters) {
@@ -401,44 +411,63 @@ const ValidationSchemaForRichParameters = (templateParameters?: TypesGen.Templat
     rich_parameter_values: Yup.array()
       .of(
         Yup.object().shape({
-          "name": Yup.string().required(),
-          "value": Yup.string().required(t("validationRequiredParameter")).test("verify with template", (val, ctx) => {
-            const name = ctx.parent.name;
-            const templateParameter = templateParameters.find((parameter) => parameter.name === name);
-            if (templateParameter) {
-              switch (templateParameter.type) {
-                case 'number':
-                  if (templateParameter.validation_min === 0 && templateParameter.validation_max === 0) {
-                    return true
-                  }
-
-                  if (Number(val) < templateParameter.validation_min || templateParameter.validation_max < Number(val)) {
-                    return ctx.createError({
-                      path: ctx.path,
-                      message: t("validationNumberNotInRange", { min: templateParameter.validation_min, max: templateParameter.validation_max }) })
-                  }
-                  break
-                case 'string':
-                  {
-                    if (templateParameter.validation_regex.length === 0) {
+          name: Yup.string().required(),
+          value: Yup.string()
+            .required(t("validationRequiredParameter"))
+            .test("verify with template", (val, ctx) => {
+              const name = ctx.parent.name
+              const templateParameter = templateParameters.find(
+                (parameter) => parameter.name === name,
+              )
+              if (templateParameter) {
+                switch (templateParameter.type) {
+                  case "number":
+                    if (
+                      templateParameter.validation_min === 0 &&
+                      templateParameter.validation_max === 0
+                    ) {
                       return true
                     }
 
-                    const regex = new RegExp(templateParameter.validation_regex);
-                    if (val && !regex.test(val)) {
+                    if (
+                      Number(val) < templateParameter.validation_min ||
+                      templateParameter.validation_max < Number(val)
+                    ) {
                       return ctx.createError({
                         path: ctx.path,
-                        message: t("validationPatternNotMatched", { error: templateParameter.validation_error, pattern: templateParameter.validation_regex })
+                        message: t("validationNumberNotInRange", {
+                          min: templateParameter.validation_min,
+                          max: templateParameter.validation_max,
+                        }),
                       })
                     }
-                  }
-                  break
+                    break
+                  case "string":
+                    {
+                      if (templateParameter.validation_regex.length === 0) {
+                        return true
+                      }
+
+                      const regex = new RegExp(
+                        templateParameter.validation_regex,
+                      )
+                      if (val && !regex.test(val)) {
+                        return ctx.createError({
+                          path: ctx.path,
+                          message: t("validationPatternNotMatched", {
+                            error: templateParameter.validation_error,
+                            pattern: templateParameter.validation_regex,
+                          }),
+                        })
+                      }
+                    }
+                    break
+                }
               }
-            }
-            return true
-          })
-        })
+              return true
+            }),
+        }),
       )
-      .required()
+      .required(),
   })
 }
diff --git a/site/src/xServices/createWorkspace/createWorkspaceXService.ts b/site/src/xServices/createWorkspace/createWorkspaceXService.ts
@@ -173,7 +173,9 @@ export const createWorkspaceMachine = createMachine(
           throw new Error("No selected template")
         }
 
-        return getTemplateVersionRichParameters(selectedTemplate.active_version_id)
+        return getTemplateVersionRichParameters(
+          selectedTemplate.active_version_id,
+        )
       },
       getTemplateSchema: (context) => {
         const { selectedTemplate } = context
@@ -242,7 +244,7 @@ export const createWorkspaceMachine = createMachine(
       assignTemplateSchema: assign({
         // Only show parameters that are allowed to be overridden.
         // CLI code: https://github.com/coder/coder/blob/main/cli/create.go#L152-L155
-        templateSchema: (_, event) => event.data
+        templateSchema: (_, event) => event.data,
       }),
       assignPermissions: assign({
         permissions: (_, event) => event.data as Record<string, boolean>,