From d696675960e76c214288edd20756cc84e40f2460 Mon Sep 17 00:00:00 2001
From: Ben <me@bpmct.net>
Date: Thu, 27 Apr 2023 16:36:50 +0000
Subject: [PATCH 1/2] fix: scroll to reveal template create errors

---
 .../CreateTemplatePage/CreateTemplateForm.tsx      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx b/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx
index da6dcea1c2533..2a11b89237422 100644
--- 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])
+
   return (
     <HorizontalForm onSubmit={form.handleSubmit}>
       {/* General info */}

From 986e01495063db20dc51cda696aaeffe9221b3d1 Mon Sep 17 00:00:00 2001
From: Ben Potter <ben@coder.com>
Date: Fri, 28 Apr 2023 08:54:15 -0500
Subject: [PATCH 2/2] Update
 site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx

Co-authored-by: Kira Pilot <kira@coder.com>
---
 site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx b/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx
index 2a11b89237422..27ca54674b442 100644
--- a/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx
+++ b/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx
@@ -234,7 +234,7 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = ({
     if (jobError) {
       window.scrollTo(0, document.body.scrollHeight)
     }
-  }, [logs])
+  }, [logs, jobError])
 
   return (
     <HorizontalForm onSubmit={form.handleSubmit}>