fix error types

AbhineetJain · AbhineetJain · commit 94640e43dc98 · 2022-08-01T16:30:18.000Z
diff --git a/site/src/api/errors.ts b/site/src/api/errors.ts
@@ -86,6 +86,3 @@ export const getValidationErrorMessage = (error: Error | ApiError | unknown): st
 
 export const getErrorDetail = (error: Error | ApiError | unknown): string | undefined | null =>
   isApiError(error) ? error.response.data.detail : error instanceof Error ? error.stack : null
-
-export const getErrorIfErrorType = (error: Error | unknown): Error | undefined =>
-  error instanceof Error ? error : undefined
diff --git a/site/src/components/Resources/Resources.tsx b/site/src/components/Resources/Resources.tsx
@@ -29,7 +29,7 @@ const Language = {
 
 interface ResourcesProps {
   resources?: WorkspaceResource[]
-  getResourcesError?: Error
+  getResourcesError?: Error | unknown
   workspace: Workspace
   canUpdateWorkspace: boolean
 }
diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
@@ -117,7 +117,7 @@ export const Workspace: FC<WorkspaceProps> = ({
           {!!resources && !!resources.length && (
             <Resources
               resources={resources}
-              getResourcesError={workspaceErrors[WorkspaceErrors.GET_RESOURCES_ERROR] as Error}
+              getResourcesError={workspaceErrors[WorkspaceErrors.GET_RESOURCES_ERROR]}
               workspace={workspace}
               canUpdateWorkspace={canUpdateWorkspace}
             />
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
@@ -1,6 +1,5 @@
 import { makeStyles } from "@material-ui/core/styles"
 import { useMachine, useSelector } from "@xstate/react"
-import { getErrorIfErrorType } from "api/errors"
 import dayjs from "dayjs"
 import minMax from "dayjs/plugin/minMax"
 import React, { useContext, useEffect } from "react"
@@ -122,10 +121,10 @@ export const WorkspacePage: React.FC = () => {
           builds={builds}
           canUpdateWorkspace={canUpdateWorkspace}
           workspaceErrors={{
-            [WorkspaceErrors.GET_RESOURCES_ERROR]: getErrorIfErrorType(getResourcesError),
-            [WorkspaceErrors.GET_BUILDS_ERROR]: getErrorIfErrorType(getBuildsError),
-            [WorkspaceErrors.BUILD_ERROR]: getErrorIfErrorType(buildError),
-            [WorkspaceErrors.CANCELLATION_MESSAGE]: getErrorIfErrorType(cancellationMessage),
+            [WorkspaceErrors.GET_RESOURCES_ERROR]: getResourcesError,
+            [WorkspaceErrors.GET_BUILDS_ERROR]: getBuildsError,
+            [WorkspaceErrors.BUILD_ERROR]: buildError,
+            [WorkspaceErrors.CANCELLATION_MESSAGE]: cancellationMessage,
           }}
         />
         <DeleteWorkspaceDialog

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ const Language = {`
`29`	`29`
`30`	`30`	`interface ResourcesProps {`
`31`	`31`	`resources?: WorkspaceResource[]`
`32`		`- getResourcesError?: Error`
	`32`	`+ getResourcesError?: Error \| unknown`
`33`	`33`	`workspace: Workspace`
`34`	`34`	`canUpdateWorkspace: boolean`
`35`	`35`	`}`