6603 - [HOTFIX] - API error handling (#6787)

* error handling over api requests * moving error handling files into V2 folder * update references to exception handler components * update of tests * update of tailwind * increases version * fixes review code issues
huridocs · May 23, 2024 · 0c70346 · 0c70346
1 parent b0ba28a
commit 0c70346
Show file tree

Hide file tree

Showing 37 changed files with 544 additions and 443 deletions.
diff --git a/app/react/App.tsx b/app/react/App.tsx
@@ -12,6 +12,7 @@ import {
   atomStore,
 } from './V2/atoms';
 import { relationshipTypesAtom } from './V2/atoms/relationshipTypes';
+import { ErrorBoundary } from './V2/Components/ErrorHandling';
 import { store } from './store';
 
 const reduxState = store?.getState();
@@ -45,7 +46,9 @@ const App = () => (
   <ReduxProvider store={store as any}>
     <CustomProvider>
       <Provider store={atomStore}>
-        <RouterProvider router={router} fallbackElement={null} />
+        <ErrorBoundary>
+          <RouterProvider router={router} fallbackElement={null} />
+        </ErrorBoundary>
       </Provider>
     </CustomProvider>
   </ReduxProvider>

diff --git a/app/react/App/ErrorHandling/ErrorBoundary.tsx b/app/react/App/ErrorHandling/ErrorBoundary.tsx
diff --git a/app/react/App/ErrorHandling/ErrorFallback.tsx b/app/react/App/ErrorHandling/ErrorFallback.tsx
diff --git a/app/react/App/ErrorHandling/ErrorUtils.ts b/app/react/App/ErrorHandling/ErrorUtils.ts
diff --git a/app/react/App/ErrorHandling/RouteErrorBoundary.tsx b/app/react/App/ErrorHandling/RouteErrorBoundary.tsx
diff --git a/app/react/App/ErrorHandling/specs/ErrorBoundary.spec.tsx b/app/react/App/ErrorHandling/specs/ErrorBoundary.spec.tsx
diff --git a/app/react/App/ErrorHandling/specs/ErrorFallback.spec.tsx b/app/react/App/ErrorHandling/specs/ErrorFallback.spec.tsx
diff --git a/app/react/App/ErrorHandling/specs/GeneralError.spec.tsx b/app/react/App/ErrorHandling/specs/GeneralError.spec.tsx
diff --git a/app/react/App/Root.js b/app/react/App/Root.js
@@ -71,6 +71,9 @@ class Root extends Component {
       innerHtml += `window.__user__ = ${serialize(this.props.user, { isJSON: true })};`;
     }
 
+    if (this.props.loadingError) {
+      innerHtml += `window.__loadingError__ = ${serialize(this.props.loadingError, { isJSON: true })};`;
+    }
     if (this.props.atomStoreData) {
       innerHtml += `window.__atomStoreData__ = ${serialize(this.props.atomStoreData, { isJSON: true })};`;
     }
@@ -129,6 +132,7 @@ Root.propTypes = {
   content: PropTypes.string,
   language: PropTypes.string,
   assets: PropTypes.object,
+  loadingError: PropTypes.object,
   atomStoreData: PropTypes.object,
 };
 

diff --git a/app/react/App/RouteHandler.js b/app/react/App/RouteHandler.js
@@ -35,8 +35,13 @@ class RouteHandler extends Component {
   constructor(props, context) {
     super(props, context);
     setLocale(getLocale(context));
+    this.state = {};
     if ((!this.isRenderedFromServer() || props.location?.state?.isClient) && isClient) {
-      this.getClientState(this.props);
+      this.getClientState(this.props).catch(ex => {
+        // used in inherited types
+        // eslint-disable-next-line react/no-unused-state
+        this.setState({ loadingError: ex });
+      });
     }
   }