GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-15 01:46:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: handling of 404 in dashboard is updated (#2908)

Browse Source
This commit is contained in:
Palash Gupta 2023-06-15 11:15:25 +05:30 committed by GitHub
parent 52a222e87a
commit 9ad17c2d60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/api/ErrorResponseHandler.ts
View File

@ -16,7 +16,7 @@ export function ErrorResponseHandler(error: AxiosError): ErrorResponse {
return {
statusCode,
payload: null,
error: 'Not Found',
error: data.errorType,
message: null,
};
}

14
frontend/src/pages/NewDashboard/index.tsx
View File

@ -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 <NotFound />;
}
if (error && !loading && dashboards.length === 0) {
return <div>{errorMessage}</div>;
return <Typography>{errorMessage}</Typography>;
}
// when user comes from dashboard page. dashboard array is populated with some dashboard as dashboard is populated

4
frontend/src/types/common/index.ts
View File

@ -25,4 +25,8 @@ export type ErrorStatusCode =
| BadRequest
| Conflict;
export enum ErrorType {
NotFound = 'not_found',
}
export type StatusCode = SuccessStatusCode | ErrorStatusCode;