pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: icon to icons for basicerror componenet (#15336) 

* initial commit

* initial commit

* fix test

* lint fix

* Update superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx

Co-authored-by: David Aaron Suddjian <1858430+suddjian@users.noreply.github.com>

* lint

Co-authored-by: David Aaron Suddjian <1858430+suddjian@users.noreply.github.com>
This commit is contained in:
Phillip Kelley-Dotson 2021-06-24 09:37:13 -07:00 committed by GitHub
parent 680b447bc4
commit a477505291
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
superset-frontend/src/components/ErrorMessage/BasicErrorAlert.test.tsx
View File

@ -43,11 +43,9 @@ test('should render', () => {
test('should render warning icon', () => {
render(<BasicErrorAlert {...mockedProps} />);
expect(screen.getByTestId('icon')).toBeInTheDocument();
expect(screen.getByTestId('icon')).toHaveAttribute(
'data-name',
'warning-solid',
);
expect(
screen.getByRole('img', { name: 'warning-solid' }),
).toBeInTheDocument();
});
test('should render error icon', () => {
@ -56,11 +54,7 @@ test('should render error icon', () => {
level: 'error' as ErrorLevel,
};
render(<BasicErrorAlert {...errorProps} />);
expect(screen.getByTestId('icon')).toBeInTheDocument();
expect(screen.getByTestId('icon')).toHaveAttribute(
'data-name',
'error-solid',
);
expect(screen.getByRole('img', { name: 'error-solid' })).toBeInTheDocument();
});
test('should render the error title', () => {

11
superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
View File

@ -18,7 +18,7 @@
*/
import React from 'react';
import { styled, supersetTheme } from '@superset-ui/core';
import Icon from '../Icon';
import Icons from 'src/components/Icons';
import { ErrorLevel } from './types';
const StyledContainer = styled.div<{ level: ErrorLevel }>`
@ -56,10 +56,11 @@ export default function BasicErrorAlert({
}: BasicErrorAlertProps) {
return (
<StyledContainer level={level} role="alert">
<Icon
name={level === 'error' ? 'error-solid' : 'warning-solid'}
color={supersetTheme.colors[level].base}
/>
{level === 'error' ? (
<Icons.ErrorSolid iconColor={supersetTheme.colors[level].base} />
) : (
<Icons.WarningSolid iconColor={supersetTheme.colors[level].base} />
)}
<StyledContent>
<StyledTitle>{title}</StyledTitle>
<p>{body}</p>