Assign PR comments

BrunoQuaresma · BrunoQuaresma · commit 5e5ea5fd63cf · 2023-03-14T14:06:42.000Z
diff --git a/site/src/i18n/en/workspacePage.json b/site/src/i18n/en/workspacePage.json
@@ -65,5 +65,8 @@
     "agentVersionLabel": "Agent version",
     "serverVersionLabel": "Server version",
     "updateWorkspaceLabel": "Update workspace"
+  },
+  "askParametersDialog": {
+    "message": "It looks like the new version has new parameters that need to be filled in to update the workspace."
   }
 }
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -23,7 +23,7 @@ import {
 import { makeStyles } from "@material-ui/core/styles"
 import {
   selectInitialRichParametersValues,
-  ValidationSchemaForRichParameters,
+  useValidationSchemaForRichParameters,
 } from "util/richParameters"
 
 export enum CreateWorkspaceErrors {
@@ -86,7 +86,7 @@ export const CreateWorkspacePageView: FC<
       },
       validationSchema: Yup.object({
         name: nameValidator(t("nameLabel", { ns: "createWorkspacePage" })),
-        rich_parameter_values: ValidationSchemaForRichParameters(
+        rich_parameter_values: useValidationSchemaForRichParameters(
           "createWorkspacePage",
           props.templateParameters,
         ),
diff --git a/site/src/pages/WorkspaceBuildParametersPage/WorkspaceBuildParametersPageView.tsx b/site/src/pages/WorkspaceBuildParametersPage/WorkspaceBuildParametersPageView.tsx
@@ -13,7 +13,7 @@ import { FormFooter } from "components/FormFooter/FormFooter"
 import * as Yup from "yup"
 import { Maybe } from "components/Conditionals/Maybe"
 import { GoBackButton } from "components/GoBackButton/GoBackButton"
-import { ValidationSchemaForRichParameters } from "util/richParameters"
+import { useValidationSchemaForRichParameters } from "util/richParameters"
 
 export enum UpdateWorkspaceErrors {
   GET_WORKSPACE_ERROR = "getWorkspaceError",
@@ -59,7 +59,7 @@ export const WorkspaceBuildParametersPageView: FC<
         rich_parameter_values: initialRichParameterValues,
       },
       validationSchema: Yup.object({
-        rich_parameter_values: ValidationSchemaForRichParameters(
+        rich_parameter_values: useValidationSchemaForRichParameters(
           "workspaceBuildParametersPage",
           props.templateParameters,
           initialRichParameterValues,
diff --git a/site/src/pages/WorkspacePage/UpdateBuildParametersDialog.tsx b/site/src/pages/WorkspacePage/UpdateBuildParametersDialog.tsx
@@ -15,11 +15,12 @@ import { RichParameterInput } from "components/RichParameterInput/RichParameterI
 import { useFormik } from "formik"
 import {
   selectInitialRichParametersValues,
-  ValidationSchemaForRichParameters,
+  useValidationSchemaForRichParameters,
 } from "util/richParameters"
 import * as Yup from "yup"
 import DialogActions from "@material-ui/core/DialogActions"
 import Button from "@material-ui/core/Button"
+import { useTranslation } from "react-i18next"
 
 export type UpdateBuildParametersDialogProps = DialogProps & {
   onClose: () => void
@@ -36,7 +37,7 @@ export const UpdateBuildParametersDialog: FC<
       rich_parameter_values: selectInitialRichParametersValues(parameters),
     },
     validationSchema: Yup.object({
-      rich_parameter_values: ValidationSchemaForRichParameters(
+      rich_parameter_values: useValidationSchemaForRichParameters(
         "createWorkspacePage",
         parameters,
       ),
@@ -46,6 +47,7 @@ export const UpdateBuildParametersDialog: FC<
     },
   })
   const getFieldHelpers = getFormHelpers(form)
+  const { t } = useTranslation("workspacePage")
 
   return (
     <Dialog
@@ -63,8 +65,7 @@ export const UpdateBuildParametersDialog: FC<
       </DialogTitle>
       <DialogContent className={styles.content}>
         <DialogContentText className={styles.info}>
-          It looks like the new version has some mandatory parameters that need
-          to be filled in to update the workspace.
+          {t("askParametersDialog.message")}
         </DialogContentText>
         <VerticalForm
           className={styles.form}
diff --git a/site/src/testHelpers/handlers.ts b/site/src/testHelpers/handlers.ts
@@ -315,7 +315,7 @@ export const handlers = [
   rest.get(
     "/api/v2/workspacebuilds/:workspaceBuildId/parameters",
     (_, res, ctx) => {
-      return res(ctx.status(200), ctx.json([M.MockTemplateVersionParameter1]))
+      return res(ctx.status(200), ctx.json([M.MockWorkspaceBuildParameter1]))
     },
   ),
 ]
diff --git a/site/src/util/richParameters.ts b/site/src/util/richParameters.ts
@@ -43,7 +43,7 @@ export const selectInitialRichParametersValues = (
   return defaults
 }
 
-export const ValidationSchemaForRichParameters = (
+export const useValidationSchemaForRichParameters = (
   ns: string,
   templateParameters?: TemplateVersionParameter[],
   lastBuildParameters?: WorkspaceBuildParameter[],

Original file line number	Diff line number	Diff line change
`@@ -65,5 +65,8 @@`
`65`	`65`	`"agentVersionLabel": "Agent version",`
`66`	`66`	`"serverVersionLabel": "Server version",`
`67`	`67`	`"updateWorkspaceLabel": "Update workspace"`
	`68`	`+ },`
	`69`	`+ "askParametersDialog": {`
	`70`	`+ "message": "It looks like the new version has new parameters that need to be filled in to update the workspace."`
`68`	`71`	`}`
`69`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ export const handlers = [`
`315`	`315`	`rest.get(`
`316`	`316`	`"/api/v2/workspacebuilds/:workspaceBuildId/parameters",`
`317`	`317`	`(_, res, ctx) => {`
`318`		`- return res(ctx.status(200), ctx.json([M.MockTemplateVersionParameter1]))`
	`318`	`+ return res(ctx.status(200), ctx.json([M.MockWorkspaceBuildParameter1]))`
`319`	`319`	`},`
`320`	`320`	`),`
`321`	`321`	`]`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export const selectInitialRichParametersValues = (`
`43`	`43`	`return defaults`
`44`	`44`	`}`
`45`	`45`
`46`		`-export const ValidationSchemaForRichParameters = (`
	`46`	`+export const useValidationSchemaForRichParameters = (`
`47`	`47`	`ns: string,`
`48`	`48`	`templateParameters?: TemplateVersionParameter[],`
`49`	`49`	`lastBuildParameters?: WorkspaceBuildParameter[],`