-
Notifications
You must be signed in to change notification settings - Fork 15
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
fix: show error UI when plugin has empty rows [DHIS2-16793] #3131
Open
HendrikThePendric
wants to merge
1
commit into
master
Choose a base branch
from
fix/prevent-pivot-table-crash-when-rows-are-empty-DHIS2-16793
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+112
−72
Open
Changes from all commits
Commits
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
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
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,35 @@ | ||
import PropTypes from 'prop-types' | ||
import React from 'react' | ||
import { GenericError } from '../../assets/ErrorIcons.js' | ||
import { VisualizationError, genericErrorTitle } from '../../modules/error.js' | ||
import styles from './styles/VisualizationErrorInfo.module.css' | ||
|
||
export const VisualizationErrorInfo = ({ error }) => ( | ||
<div | ||
className={styles.errorContainer} | ||
data-test="start-screen-error-container" | ||
> | ||
{error instanceof VisualizationError ? ( | ||
<> | ||
<div className={styles.errorIcon}>{error.icon()}</div> | ||
<p className={styles.errorTitle}>{error.title}</p> | ||
<p className={styles.errorDescription}>{error.description}</p> | ||
</> | ||
) : ( | ||
<> | ||
<div className={styles.errorIcon}>{GenericError()}</div> | ||
<p className={styles.errorTitle}>{genericErrorTitle}</p> | ||
<p className={styles.errorDescription}> | ||
{error.message || error} | ||
</p> | ||
</> | ||
)} | ||
</div> | ||
) | ||
|
||
VisualizationErrorInfo.propTypes = { | ||
error: PropTypes.oneOfType([ | ||
PropTypes.instanceOf(Error), | ||
PropTypes.instanceOf(VisualizationError), | ||
]), | ||
} |
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
30 changes: 30 additions & 0 deletions
30
src/components/Visualization/styles/VisualizationErrorInfo.module.css
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,30 @@ | ||
.errorContainer { | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
text-align: center; | ||
justify-content: center; | ||
width: 100%; | ||
} | ||
.errorIcon { | ||
width: 136px; | ||
height: 136px; | ||
margin: 0 auto var(--spacers-dp24); | ||
} | ||
.errorTitle { | ||
font-weight: 500; | ||
font-size: 20px; | ||
color: var(--colors-grey800); | ||
letter-spacing: 0.15px; | ||
line-height: 24px; | ||
width: 360px; | ||
margin: 0 auto var(--spacers-dp12); | ||
} | ||
.errorDescription { | ||
font-weight: 400; | ||
font-size: 14px; | ||
color: var(--colors-grey700); | ||
line-height: 19px; | ||
width: 360px; | ||
margin: 0 auto; | ||
} |
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
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.
I see that this wasn't previously in a try/catch either. Does this ever throw? What does the user experience in this case?
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 worked on this quite a while ago, but I am pretty sure it is like this (quite complicated):
onResponsesReceived
is defined inVisualization
and callsensureAnalyticsResponsesContainData
. It is passed as a prop toPluginWrapper
.PluginWrapper
when a response comes in: it is called bydoFetchData
which in turn is called indoFetchAll
.doFetchAll()
returns a Promise and the catch method of this promise is called (doFetchAll().catch(..)
). In the catch calbackonError()
is being called with the error. So ifensureAnalyticsResponsesContainData()
throws an error this will be the parameter passed toonError(error)
onError
itself is another prop called by thePluginWrapper
but defined in theVisualization
. It ends up callingthis.props.setLoadError(error)
and this will ensure theStartScreen
is rendered with the appropriate message.