Merge branch 'main' into 7452-banner-legacy-params

mtojek · mtojek · commit 4729d7dba0c7 · 2023-05-11T19:19:01.000+02:00
diff --git a/docs/admin/auth.md b/docs/admin/auth.md
@@ -197,6 +197,15 @@ CODER_OIDC_SIGN_IN_TEXT="Sign in with Gitea"
 CODER_OIDC_ICON_URL=https://gitea.io/images/gitea.png
 ```
 
+## Disable Built-in Authentication
+
+To remove email and password login, set the following environment variable on your
+Coder deployment:
+
+```console
+CODER_DISABLE_PASSWORD_AUTH=true
+```
+
 ## SCIM (enterprise)
 
 Coder supports user provisioning and deprovisioning via SCIM 2.0 with header
diff --git a/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx b/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx
@@ -16,7 +16,7 @@ import {
 } from "pages/CreateTemplatePage/TemplateUpload"
 import { useFormik } from "formik"
 import { SelectedTemplate } from "pages/CreateWorkspacePage/SelectedTemplate"
-import { FC } from "react"
+import { FC, useEffect } from "react"
 import { useTranslation } from "react-i18next"
 import {
   nameValidator,
@@ -224,6 +224,18 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = ({
   const { t } = useTranslation("createTemplatePage")
   const { t: commonT } = useTranslation("common")
 
+  useEffect(() => {
+    if (error) {
+      window.scrollTo(0, 0)
+    }
+  }, [error])
+
+  useEffect(() => {
+    if (jobError) {
+      window.scrollTo(0, document.body.scrollHeight)
+    }
+  }, [logs, jobError])
+
   return (
     <HorizontalForm onSubmit={form.handleSubmit}>
       {/* General info */}
