Add one more error boundary layer for not found (airbytehq#11626)

* Add one more error boundary layer for not found * Fix import paths
roelsadza · Apr 1, 2022 · 4b9a077 · 4b9a077
1 parent 22f2206
commit 4b9a077
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/airbyte-webapp/src/components/ApiErrorBoundary/ApiErrorBoundary.tsx b/airbyte-webapp/src/components/ApiErrorBoundary/ApiErrorBoundary.tsx
@@ -3,6 +3,8 @@ import React from "react";
 import { FormattedMessage } from "react-intl";
 import { isVersionError } from "core/request/VersionError";
 import { ErrorOccurredView } from "views/common/ErrorOccurredView";
+import { StartOverErrorView } from "views/common/StartOverErrorView";
+import { ResourceNotFoundErrorBoundary } from "views/common/ResorceNotFoundErrorBoundary";
 
 type BoundaryState = { errorId?: string; message?: string };
 
@@ -55,7 +57,9 @@ class ApiErrorBoundary extends React.Component<unknown, BoundaryState> {
     }
 
     return !this.state.errorId ? (
-      this.props.children
+      <ResourceNotFoundErrorBoundary errorComponent={<StartOverErrorView />}>
+        {this.props.children}
+      </ResourceNotFoundErrorBoundary>
     ) : (
       <ErrorOccurredView message="Unknown error occurred" />
     );

diff --git a/airbyte-webapp/src/views/common/ResorceNotFoundErrorBoundary.tsx b/airbyte-webapp/src/views/common/ResorceNotFoundErrorBoundary.tsx
@@ -15,7 +15,8 @@ export class ResourceNotFoundErrorBoundary extends React.Component<
   BoundaryState
 > {
   static getDerivedStateFromError(error: CommonRequestError): BoundaryState {
-    if (error.status === 422) {
+    console.log(error.status);
+    if (error.status === 422 || error.status === 404) {
       return {
         hasError: true,
         message: <FormattedMessage id="errorView.notFound" />,