Skip to content

Commit 34627ea

Browse files
committed
fix: improve error handling and logging in resource creation and SSE worker
1 parent 62e65ef commit 34627ea

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

src/components/ResourceBrowser/ResourceList/CreateResource.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import React, { useEffect, useState } from 'react'
1818

1919
import {
20+
API_STATUS_CODES,
2021
Button,
2122
ButtonStyleType,
2223
ButtonVariantType,
@@ -27,7 +28,11 @@ import {
2728
GenericEmptyState,
2829
handleAnalyticsEvent,
2930
InfoBlock,
31+
ServerErrors,
3032
showError,
33+
TOAST_ACCESS_DENIED,
34+
ToastManager,
35+
ToastVariantType,
3136
useRegisterShortcut,
3237
} from '@devtron-labs/devtron-fe-common-lib'
3338

@@ -89,7 +94,14 @@ export const CreateResource: React.FC<CreateResourceType> = ({ closePopup, clust
8994
setNeedsUpdate(true)
9095
}
9196
} catch (err) {
92-
showError(err)
97+
if ((err as ServerErrors).code === API_STATUS_CODES.PERMISSION_DENIED) {
98+
ToastManager.showToast({
99+
variant: ToastVariantType.notAuthorized,
100+
description: (err as ServerErrors).errors?.[0]?.userMessage || TOAST_ACCESS_DENIED.SUBTITLE,
101+
})
102+
} else {
103+
showError(err)
104+
}
93105
} finally {
94106
setLoader(false)
95107
}

src/components/app/grepSSEworker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default () => {
3434
eventListener(ev) {
3535
let log
3636
try {
37-
log = JSON.parse(ev.data).result.content
37+
log = JSON.parse(ev.data).result.content ?? ev.data
3838
} catch (e) {
3939
log = ev.data
4040
}

src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Manifest.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ const ManifestComponent = ({
462462
if (err.code === 403) {
463463
ToastManager.showToast({
464464
variant: ToastVariantType.notAuthorized,
465-
description: TOAST_ACCESS_DENIED.SUBTITLE,
465+
description: (err as ServerErrors).errors?.[0]?.userMessage || TOAST_ACCESS_DENIED.SUBTITLE,
466466
})
467467
} else if (err.code === 400 || err.code === 409 || err.code === 422) {
468468
const er = err.errors && err.errors[0]

0 commit comments

Comments
 (0)