Don't show ephemeral parameters on create form

coder · BrunoQuaresma · Jul 18, 2023 · Jul 13, 2023 · Jul 14, 2023 · Jul 14, 2023
commit 98fd6f8606f28feaf8e6a64e1a93f60852cecd22
diff --git a/site/src/components/WorkspaceActions/Buttons.tsx b/site/src/components/WorkspaceActions/Buttons.tsx
@@ -42,6 +42,7 @@ export const StartButton: FC<
 > = ({ handleAction, workspace, loading }) => {
   return (
     <ButtonGroup
+      key="start"
       variant="outlined"
       sx={{
         // Workaround to make the border transitions smmothly on button groups
@@ -90,6 +91,7 @@ export const RestartButton: FC<
 > = ({ handleAction, loading, workspace }) => {
   return (
     <ButtonGroup
+      key="restart"
       variant="outlined"
       sx={{
         // Workaround to make the border transitions smmothly on button groups

diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -28,6 +28,7 @@ import {
   MutableTemplateParametersSection,
 } from "components/TemplateParameters/TemplateParameters"
 import { ErrorAlert } from "components/Alert/ErrorAlert"
+import { paramUsedToCreateWorkspace } from "utils/workspace"
 
 export enum CreateWorkspaceErrors {
   GET_TEMPLATES_ERROR = "getTemplatesError",
@@ -59,8 +60,11 @@ export interface CreateWorkspacePageViewProps {
 export const CreateWorkspacePageView: FC<
   React.PropsWithChildren<CreateWorkspacePageViewProps>
 > = (props) => {
+  const templateParameters = props.templateParameters?.filter(
+    paramUsedToCreateWorkspace,
+  )
   const initialRichParameterValues = selectInitialRichParametersValues(
-    props.templateParameters,
+    templateParameters,
     props.defaultParameterValues,
   )
   const [gitAuthErrors, setGitAuthErrors] = useState<Record<string, string>>({})
@@ -72,20 +76,16 @@ export const CreateWorkspacePageView: FC<
     // to disappear.
     setGitAuthErrors({})
   }, [props.templateGitAuth])
-
   const workspaceErrors =
     props.createWorkspaceErrors[CreateWorkspaceErrors.CREATE_WORKSPACE_ERROR]
-
   // Scroll to top of page if errors are present
   useEffect(() => {
     if (props.hasTemplateErrors || Boolean(workspaceErrors)) {
       window.scrollTo(0, 0)
     }
   }, [props.hasTemplateErrors, workspaceErrors])
-
   const { t } = useTranslation("createWorkspacePage")
   const styles = useStyles()
-
   const form: FormikContextType<TypesGen.CreateWorkspaceRequest> =
     useFormik<TypesGen.CreateWorkspaceRequest>({
       initialValues: {
@@ -97,7 +97,7 @@ export const CreateWorkspacePageView: FC<
         name: nameValidator(t("nameLabel", { ns: "createWorkspacePage" })),
         rich_parameter_values: useValidationSchemaForRichParameters(
           "createWorkspacePage",
-          props.templateParameters,
+          templateParameters,
         ),
       }),
       enableReinitialize: true,
@@ -240,10 +240,10 @@ export const CreateWorkspacePageView: FC<
           </FormSection>
         )}
 
-        {props.templateParameters && (
+        {templateParameters && (
           <>
             <MutableTemplateParametersSection
-              templateParameters={props.templateParameters}
+              templateParameters={templateParameters}
               getInputProps={(parameter, index) => {
                 return {
                   ...getFieldHelpers(
@@ -264,7 +264,7 @@ export const CreateWorkspacePageView: FC<
               }}
             />
             <ImmutableTemplateParametersSection
-              templateParameters={props.templateParameters}
+              templateParameters={templateParameters}
               classes={{ root: styles.warningSection }}
               getInputProps={(parameter, index) => {
                 return {

diff --git a/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPage.tsx b/site/src/pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPage.tsx
@@ -21,6 +21,7 @@ import {
   selectInitialRichParametersValues,
   workspaceBuildParameterValue,
 } from "utils/richParameters"
+import { paramUsedToCreateWorkspace } from "utils/workspace"
 
 type ButtonValues = Record<string, string>
 
@@ -38,7 +39,9 @@ const TemplateEmbedPage = () => {
       </Helmet>
       <TemplateEmbedPageView
         template={template}
-        templateParameters={templateParameters}
+        templateParameters={templateParameters?.filter(
+          paramUsedToCreateWorkspace,
+        )}
       />
     </>
   )

diff --git a/site/src/utils/workspace.tsx b/site/src/utils/workspace.tsx
@@ -285,3 +285,7 @@ const LoadingIcon = () => {
 export const hasJobError = (workspace: TypesGen.Workspace) => {
   return workspace.latest_build.job.error !== undefined
 }
+
+export const paramUsedToCreateWorkspace = (
+  param: TypesGen.TemplateVersionParameter,
+) => !param.ephemeral