IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

add support for expandable error message (#33189)

Browse Source
This commit is contained in:
Vicky Lee 2021-04-23 10:37:47 +01:00 committed by GitHub
parent 3bae330286
commit 99a04ed612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
View File

@ -45,6 +45,7 @@ export enum HealthStatus {
* plugin.
*
* If the 'message' key exists, this will be displayed in the error message in DataSourceSettingsPage
* If the 'verboseMessage' key exists, this will be displayed in the expandable details in the error message in DataSourceSettingsPage
*
* @public
*/

15
public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx
View File

@ -139,4 +139,19 @@ describe('Render', () => {
expect(screen.getByText(mockProps.testingStatus.message)).toBeInTheDocument();
});
it('should render verbose error message with detailed verbose error message', () => {
const mockProps = {
...getProps(),
testingStatus: {
message: 'message',
status: 'error',
details: { message: 'detailed message', verboseMessage: 'verbose message' },
},
};
render(<DataSourceSettingsPage {...mockProps} />);
expect(screen.getByText(mockProps.testingStatus.details.verboseMessage)).toBeInTheDocument();
});
});

3
public/app/features/datasources/settings/DataSourceSettingsPage.tsx
View File

@ -241,6 +241,9 @@ export class DataSourceSettingsPage extends PureComponent<Props> {
aria-label={selectors.pages.DataSource.alert}
>
{testingStatus.details?.message ?? null}
{testingStatus.details?.verboseMessage ? (
<details style={{ whiteSpace: 'pre-wrap' }}>{testingStatus.details?.verboseMessage}</details>
) : null}
</Alert>
)}
</div>