fix: error alert levels again (apache#17027)

QAlexBall · Oct 11, 2021 · c116221 · c116221
1 parent ac1e7ab
commit c116221
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/BasicErrorAlert.tsx
@@ -51,17 +51,18 @@ interface BasicErrorAlertProps {
 
 export default function BasicErrorAlert({
   body,
-  level,
+  level = 'error',
   title,
 }: BasicErrorAlertProps) {
   const theme = useTheme();
+  const iconColor = theme.colors[level].base;
 
   return (
     <StyledContainer level={level} role="alert">
-      {!level || level === 'error' ? (
-        <Icons.ErrorSolid iconColor={theme.colors.error.base} />
+      {level === 'error' ? (
+        <Icons.ErrorSolid iconColor={iconColor} />
       ) : (
-        <Icons.WarningSolid iconColor={theme.colors[level].base} />
+        <Icons.WarningSolid iconColor={iconColor} />
       )}
       <StyledContent>
         <StyledTitle>{title}</StyledTitle>

diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
@@ -92,7 +92,7 @@ interface ErrorAlertProps {
 export default function ErrorAlert({
   body,
   copyText,
-  level,
+  level = 'error',
   source = 'dashboard',
   subtitle,
   title,
@@ -103,21 +103,16 @@ export default function ErrorAlert({
   const [isBodyExpanded, setIsBodyExpanded] = useState(false);
 
   const isExpandable = ['explore', 'sqllab'].includes(source);
+  const iconColor = theme.colors[level].base;
 
   return (
     <ErrorAlertDiv level={level} role="alert">
       <div className="top-row">
         <LeftSideContent>
-          {!level || level === 'error' ? (
-            <Icons.ErrorSolid
-              className="icon"
-              iconColor={theme.colors.error.base}
-            />
+          {level === 'error' ? (
+            <Icons.ErrorSolid className="icon" iconColor={iconColor} />
           ) : (
-            <Icons.WarningSolid
-              className="icon"
-              iconColor={theme.colors[level].base}
-            />
+            <Icons.WarningSolid className="icon" iconColor={iconColor} />
           )}
           <strong>{title}</strong>
         </LeftSideContent>
@@ -171,16 +166,10 @@ export default function ErrorAlert({
           onHide={() => setIsModalOpen(false)}
           title={
             <div className="header">
-              {!level || level === 'error' ? (
-                <Icons.ErrorSolid
-                  className="icon"
-                  iconColor={theme.colors.error.base}
-                />
+              {level === 'error' ? (
+                <Icons.ErrorSolid className="icon" iconColor={iconColor} />
               ) : (
-                <Icons.WarningSolid
-                  className="icon"
-                  iconColor={theme.colors[level].base}
-                />
+                <Icons.WarningSolid className="icon" iconColor={iconColor} />
               )}
               <div className="title">{title}</div>
             </div>