diff --git a/frontend/src/api/ErrorResponseHandler.ts b/frontend/src/api/ErrorResponseHandler.ts
index 060b93493f..2c42f0951b 100644
--- a/frontend/src/api/ErrorResponseHandler.ts
+++ b/frontend/src/api/ErrorResponseHandler.ts
@@ -16,7 +16,7 @@ export function ErrorResponseHandler(error: AxiosError): ErrorResponse {
return {
statusCode,
payload: null,
- error: 'Not Found',
+ error: data.errorType,
message: null,
};
}
diff --git a/frontend/src/pages/NewDashboard/index.tsx b/frontend/src/pages/NewDashboard/index.tsx
index 2183531f63..6d64ca500f 100644
--- a/frontend/src/pages/NewDashboard/index.tsx
+++ b/frontend/src/pages/NewDashboard/index.tsx
@@ -1,3 +1,5 @@
+import { Typography } from 'antd';
+import NotFound from 'components/NotFound';
import Spinner from 'components/Spinner';
import NewDashboard from 'container/NewDashboard';
import { useEffect } from 'react';
@@ -8,6 +10,7 @@ import { ThunkDispatch } from 'redux-thunk';
import { GetDashboard, GetDashboardProps } from 'store/actions/dashboard';
import { AppState } from 'store/reducers';
import AppActions from 'types/actions';
+import { ErrorType } from 'types/common';
import DashboardReducer from 'types/reducer/dashboards';
function NewDashboardPage({ getDashboard }: NewDashboardProps): JSX.Element {
@@ -26,8 +29,17 @@ function NewDashboardPage({ getDashboard }: NewDashboardProps): JSX.Element {
}
}, [getDashboard, dashboardId, dashboards.length]);
+ if (
+ error &&
+ !loading &&
+ dashboards.length === 0 &&
+ errorMessage === ErrorType.NotFound
+ ) {
+ return