Move ErrorSummary under PageHeader in workspace and template

presleyp · presleyp · commit d201301cc135 · 2022-08-31T15:53:05.000Z
diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
@@ -66,20 +66,19 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
   const styles = useStyles()
   const navigate = useNavigate()
 
+  const buildError = workspaceErrors[WorkspaceErrors.BUILD_ERROR] ? (
+    <ErrorSummary error={workspaceErrors[WorkspaceErrors.BUILD_ERROR]} dismissible />
+  ) : (
+    <></>
+  )
+  const cancellationError = workspaceErrors[WorkspaceErrors.CANCELLATION_ERROR] ? (
+    <ErrorSummary error={workspaceErrors[WorkspaceErrors.CANCELLATION_ERROR]} dismissible />
+  ) : (
+    <></>
+  )
+
   return (
     <Margins>
-      <Stack spacing={1}>
-        {workspaceErrors[WorkspaceErrors.BUILD_ERROR] ? (
-          <ErrorSummary error={workspaceErrors[WorkspaceErrors.BUILD_ERROR]} dismissible />
-        ) : (
-          <></>
-        )}
-        {workspaceErrors[WorkspaceErrors.CANCELLATION_ERROR] ? (
-          <ErrorSummary error={workspaceErrors[WorkspaceErrors.CANCELLATION_ERROR]} dismissible />
-        ) : (
-          <></>
-        )}
-      </Stack>
       <PageHeader
         actions={
           <Stack direction="row" spacing={1} className={styles.actions}>
@@ -107,38 +106,36 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
         <PageHeaderSubtitle>{workspace.owner_name}</PageHeaderSubtitle>
       </PageHeader>
 
-      <Stack direction="row" spacing={3}>
-        <Stack direction="column" className={styles.firstColumnSpacer} spacing={3}>
-          <WorkspaceScheduleBanner
-            isLoading={bannerProps.isLoading}
-            onExtend={bannerProps.onExtend}
-            workspace={workspace}
-          />
+      <Stack direction="column" className={styles.firstColumnSpacer} spacing={2.5}>
+        {buildError}
+        {cancellationError}
+
+        <WorkspaceScheduleBanner
+          isLoading={bannerProps.isLoading}
+          onExtend={bannerProps.onExtend}
+          workspace={workspace}
+        />
 
-          <WorkspaceDeletedBanner
+        <WorkspaceDeletedBanner workspace={workspace} handleClick={() => navigate(`/templates`)} />
+
+        <WorkspaceStats workspace={workspace} handleUpdate={handleUpdate} />
+
+        {!!resources && !!resources.length && (
+          <Resources
+            resources={resources}
+            getResourcesError={workspaceErrors[WorkspaceErrors.GET_RESOURCES_ERROR]}
             workspace={workspace}
-            handleClick={() => navigate(`/templates`)}
+            canUpdateWorkspace={canUpdateWorkspace}
           />
+        )}
 
-          <WorkspaceStats workspace={workspace} handleUpdate={handleUpdate} />
-
-          {!!resources && !!resources.length && (
-            <Resources
-              resources={resources}
-              getResourcesError={workspaceErrors[WorkspaceErrors.GET_RESOURCES_ERROR]}
-              workspace={workspace}
-              canUpdateWorkspace={canUpdateWorkspace}
-            />
+        <WorkspaceSection title="Logs" contentsProps={{ className: styles.timelineContents }}>
+          {workspaceErrors[WorkspaceErrors.GET_BUILDS_ERROR] ? (
+            <ErrorSummary error={workspaceErrors[WorkspaceErrors.GET_BUILDS_ERROR]} />
+          ) : (
+            <BuildsTable builds={builds} className={styles.timelineTable} />
           )}
-
-          <WorkspaceSection title="Logs" contentsProps={{ className: styles.timelineContents }}>
-            {workspaceErrors[WorkspaceErrors.GET_BUILDS_ERROR] ? (
-              <ErrorSummary error={workspaceErrors[WorkspaceErrors.GET_BUILDS_ERROR]} />
-            ) : (
-              <BuildsTable builds={builds} className={styles.timelineTable} />
-            )}
-          </WorkspaceSection>
-        </Stack>
+        </WorkspaceSection>
       </Stack>
     </Margins>
   )
diff --git a/site/src/pages/TemplatePage/TemplatePageView.tsx b/site/src/pages/TemplatePage/TemplatePageView.tsx
@@ -57,6 +57,12 @@ export const TemplatePageView: FC<React.PropsWithChildren<TemplatePageViewProps>
   const readme = frontMatter(activeTemplateVersion.readme)
   const hasIcon = template.icon && template.icon !== ""
 
+  const deleteError = deleteTemplateError ? (
+    <ErrorSummary error={deleteTemplateError} dismissible />
+  ) : (
+    <></>
+  )
+
   const getStartedResources = (resources: WorkspaceResource[]) => {
     return resources.filter((resource) => resource.workspace_transition === "start")
   }
@@ -72,7 +78,6 @@ export const TemplatePageView: FC<React.PropsWithChildren<TemplatePageViewProps>
   return (
     <Margins>
       <>
-        {deleteTemplateError && <ErrorSummary error={deleteTemplateError} dismissible />}
         <PageHeader
           actions={
             <Stack direction="row" spacing={1}>
@@ -125,6 +130,7 @@ export const TemplatePageView: FC<React.PropsWithChildren<TemplatePageViewProps>
         </PageHeader>
 
         <Stack spacing={2.5}>
+          {deleteError}
           <TemplateStats template={template} activeVersion={activeTemplateVersion} />
           <WorkspaceSection
             title={Language.resourcesTitle}
