-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
OV-7: error handling #21
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
daec78e
OV-7: + string to react node helper error handling middleware
WilsonBravo 327e22d
OV-7: - string to react node helper
WilsonBravo bda0e54
OV-7: + toast service
WilsonBravo 254430a
OV-7: * rename toast service to notification service
WilsonBravo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
export { stringToReactNode } from './string-to-react-node.js'; | ||
export { configureString } from 'shared'; |
11 changes: 11 additions & 0 deletions
11
frontend/src/bundles/common/helpers/string-to-react-node.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { type ReactNode } from 'react'; | ||
|
||
const stringToReactNode = (message: string): ReactNode => { | ||
return message.split('\n').map((line, index) => ( | ||
<div key={index} style={{ whiteSpace: 'pre-wrap' }}> | ||
{line} | ||
</div> | ||
)); | ||
}; | ||
|
||
export { stringToReactNode }; |
47 changes: 47 additions & 0 deletions
47
frontend/src/bundles/common/middlewares/error-handling.middleware.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
import { createStandaloneToast } from '@chakra-ui/react'; | ||
import { | ||
type Middleware, | ||
isRejected, | ||
isRejectedWithValue, | ||
} from '@reduxjs/toolkit'; | ||
import { type ServerValidationErrorResponse } from 'shared'; | ||
|
||
import { theme } from '~/framework/theme/theme.js'; | ||
|
||
import { stringToReactNode } from '../helpers/helpers.js'; | ||
|
||
const { toast } = createStandaloneToast({ theme: theme }); | ||
const toastId = 'redux-store-error'; | ||
|
||
const errorMiddleware: Middleware = () => { | ||
return (next) => (action) => { | ||
let message: string = ''; | ||
if (isRejectedWithValue(action)) { | ||
message += JSON.stringify(action.payload); | ||
} else if (isRejected(action)) { | ||
const error = action.error as ServerValidationErrorResponse; | ||
message += `${error.message}\n`; | ||
if (error.details) { | ||
for (const errorDetail of error.details) { | ||
message += `\t- ${errorDetail.message}\n`; | ||
} | ||
} | ||
} | ||
|
||
if (message !== '' && !toast.isActive(toastId)) { | ||
toast({ | ||
id: toastId, | ||
title: 'An error occurred.', | ||
description: stringToReactNode(message), | ||
status: 'error', | ||
duration: 7000, | ||
isClosable: true, | ||
position: 'top-right', | ||
}); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Create a separate service for Toast that we could call for multiple scenarios: error, warn, success, etc. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
} | ||
|
||
return next(action); | ||
}; | ||
}; | ||
|
||
export { errorMiddleware }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { errorMiddleware } from './error-handling.middleware.js'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
helpers should not contain .tsx files. And also create a folder for file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I deleted the helper based on the recommendations provided during the daily meeting.