Skip to content

Commit 200196b

Browse files
committed
feat: add reload prop for error screen manager
1 parent e8277e2 commit 200196b

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "0.0.79-beta-13",
3+
"version": "0.0.79-beta-14",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Common/ErrorPage.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import GenericEmptyState from './EmptyState/GenericEmptyState'
44
import { ErrorPageType } from './Types'
55
import { noop, refresh, reportIssue } from './Helper'
66

7-
const ErrorPage = ({ code, image, title, subTitle, imageType, heightToDeduct }: ErrorPageType) => {
7+
const ErrorPage = ({ code, image, title, subTitle, imageType, heightToDeduct, reload }: ErrorPageType) => {
88
const { push } = useHistory()
99
const redirectToHome = () => {
1010
push(`/${ROUTES.APP_LIST}`)
@@ -29,7 +29,11 @@ const ErrorPage = ({ code, image, title, subTitle, imageType, heightToDeduct }:
2929
case ERROR_STATUS_CODE.BAD_REQUEST:
3030
case ERROR_STATUS_CODE.BAD_GATEWAY:
3131
case ERROR_STATUS_CODE.SERVICE_TEMPORARY_UNAVAILABLE:
32-
return { onClick: refresh, renderButtonText: ERROR_EMPTY_SCREEN.TRY_AGAIN, isButtonAvailable: true }
32+
return {
33+
onClick: reload ?? refresh,
34+
renderButtonText: ERROR_EMPTY_SCREEN.TRY_AGAIN,
35+
isButtonAvailable: true,
36+
}
3337
default:
3438
return { onClick: noop, renderButtonText: '', isButtonAvailable: false }
3539
}

src/Common/ErrorScreenManager.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const ErrorScreenManager = ({ code, reload, subtitle, reloadClass, heightToDeduc
1818
image={badRequest}
1919
imageType={ImageType.Large}
2020
heightToDeduct={heightToDeduct}
21+
reload={reload}
2122
/>
2223
)
2324
case ERROR_STATUS_CODE.UNAUTHORIZED:

src/Common/Types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export interface GenericEmptyStateType {
139139
}
140140

141141
export interface ErrorPageType
142-
extends Pick<GenericEmptyStateType, 'image' | 'title' | 'subTitle' | 'renderButton' | 'imageType'> {
142+
extends Pick<GenericEmptyStateType, 'image' | 'title' | 'subTitle' | 'renderButton' | 'imageType'>, Pick<ErrorScreenManagerProps, 'reload'> {
143143
code: number
144144
heightToDeduct?: number
145145
}

src/Shared/Components/APIResponseHandler/APIResponseHandler.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ const APIResponseHandler = ({
2525
}
2626

2727
if (error) {
28+
// This will be used for handling error screen for small screen size
29+
if (genericSectionErrorProps) {
30+
return <GenericSectionErrorState {...genericSectionErrorProps} />
31+
}
32+
2833
// TODO: Can extend ErrorScreenNotFound
2934
if (error?.code === 404) {
3035
return (
@@ -35,10 +40,6 @@ const APIResponseHandler = ({
3540
)
3641
}
3742

38-
if (genericSectionErrorProps) {
39-
return <GenericSectionErrorState {...genericSectionErrorProps} />
40-
}
41-
4243
return <Reload {...reloadProps} />
4344
}
4445

0 commit comments

Comments
 (0)