Remove error logic from Resources

BrunoQuaresma · BrunoQuaresma · commit f542eaace029 · 2022-10-27T14:13:14.000Z
diff --git a/site/src/components/BuildsTable/BuildsTable.tsx b/site/src/components/BuildsTable/BuildsTable.tsx
@@ -22,7 +22,6 @@ export const Language = {
 
 export interface BuildsTableProps {
   builds?: TypesGen.WorkspaceBuild[]
-  className?: string
 }
 
 const groupBuildsByDate = (builds?: TypesGen.WorkspaceBuild[]) => {
@@ -48,13 +47,12 @@ const groupBuildsByDate = (builds?: TypesGen.WorkspaceBuild[]) => {
 
 export const BuildsTable: FC<React.PropsWithChildren<BuildsTableProps>> = ({
   builds,
-  className,
 }) => {
   const isLoading = !builds
   const buildsByDate = groupBuildsByDate(builds)
 
   return (
-    <TableContainer className={className}>
+    <TableContainer>
       <Table data-testid="builds-table" aria-describedby="builds table">
         <TableBody>
           {isLoading && <TableLoader />}
diff --git a/site/src/components/Resources/Resources.tsx b/site/src/components/Resources/Resources.tsx
@@ -11,7 +11,6 @@ import {
   WorkspaceResource,
 } from "../../api/typesGenerated"
 import { Stack } from "../Stack/Stack"
-import { AlertBanner } from "components/AlertBanner/AlertBanner"
 import { ResourceCard } from "./ResourceCard"
 
 const countAgents = (resource: WorkspaceResource) => {
@@ -20,7 +19,6 @@ const countAgents = (resource: WorkspaceResource) => {
 
 interface ResourcesProps {
   resources: WorkspaceResource[]
-  getResourcesError?: Error | unknown
   workspace: Workspace
   canUpdateWorkspace: boolean
   buildInfo?: BuildInfoResponse | undefined
@@ -30,7 +28,7 @@ interface ResourcesProps {
 
 export const Resources: FC<React.PropsWithChildren<ResourcesProps>> = ({
   resources,
-  getResourcesError,
+
   workspace,
   canUpdateWorkspace,
   hideSSHButton,
@@ -49,10 +47,6 @@ export const Resources: FC<React.PropsWithChildren<ResourcesProps>> = ({
         .sort((a, b) => countAgents(b) - countAgents(a))
   const hasHideResources = resources.some((r) => r.hide)
 
-  if (getResourcesError) {
-    return <AlertBanner severity="error" error={getResourcesError} />
-  }
-
   return (
     <Stack direction="column" spacing={0}>
       {displayResources.map((resource) => {
diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
@@ -16,7 +16,6 @@ import { WorkspaceActions } from "../WorkspaceActions/WorkspaceActions"
 import { WorkspaceDeletedBanner } from "../WorkspaceDeletedBanner/WorkspaceDeletedBanner"
 import { WorkspaceScheduleBanner } from "../WorkspaceScheduleBanner/WorkspaceScheduleBanner"
 import { WorkspaceScheduleButton } from "../WorkspaceScheduleButton/WorkspaceScheduleButton"
-import { WorkspaceSection } from "../WorkspaceSection/WorkspaceSection"
 import { WorkspaceStats } from "../WorkspaceStats/WorkspaceStats"
 import { AlertBanner } from "../AlertBanner/AlertBanner"
 import { useTranslation } from "react-i18next"
@@ -207,12 +206,16 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
           />
         )}
 
+        {Boolean(workspaceErrors[WorkspaceErrors.GET_RESOURCES_ERROR]) && (
+          <AlertBanner
+            severity="error"
+            error={workspaceErrors[WorkspaceErrors.GET_RESOURCES_ERROR]}
+          />
+        )}
+
         {typeof resources !== "undefined" && resources.length > 0 && (
           <Resources
             resources={resources}
-            getResourcesError={
-              workspaceErrors[WorkspaceErrors.GET_RESOURCES_ERROR]
-            }
             workspace={workspace}
             canUpdateWorkspace={canUpdateWorkspace}
             buildInfo={buildInfo}
@@ -221,18 +224,14 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
           />
         )}
 
-        <WorkspaceSection
-          contentsProps={{ className: styles.timelineContents }}
-        >
-          {workspaceErrors[WorkspaceErrors.GET_BUILDS_ERROR] ? (
-            <AlertBanner
-              severity="error"
-              error={workspaceErrors[WorkspaceErrors.GET_BUILDS_ERROR]}
-            />
-          ) : (
-            <BuildsTable builds={builds} className={styles.timelineTable} />
-          )}
-        </WorkspaceSection>
+        {workspaceErrors[WorkspaceErrors.GET_BUILDS_ERROR] ? (
+          <AlertBanner
+            severity="error"
+            error={workspaceErrors[WorkspaceErrors.GET_BUILDS_ERROR]}
+          />
+        ) : (
+          <BuildsTable builds={builds} />
+        )}
       </Stack>
     </Margins>
   )
@@ -276,9 +275,5 @@ export const useStyles = makeStyles((theme) => {
     timelineContents: {
       margin: 0,
     },
-
-    timelineTable: {
-      border: 0,
-    },
   }
 })
