diff --git a/packages/grafana-ui/src/components/Badge/Badge.tsx b/packages/grafana-ui/src/components/Badge/Badge.tsx index 969c6ebfb10..f77f100a50b 100644 --- a/packages/grafana-ui/src/components/Badge/Badge.tsx +++ b/packages/grafana-ui/src/components/Badge/Badge.tsx @@ -18,25 +18,28 @@ export interface BadgeProps extends HTMLAttributes { color: BadgeColor; icon?: IconName; tooltip?: string; + interactive?: boolean; } -const BadgeComponent = React.memo(({ icon, color, text, tooltip, className, ...otherProps }) => { - const styles = useStyles2(getStyles, color); - const badge = ( -
- {icon && } - {text} -
- ); +const BadgeComponent = React.memo( + ({ icon, color, text, tooltip, interactive, className, ...otherProps }) => { + const styles = useStyles2(getStyles, color); + const badge = ( +
+ {icon && } + {text} +
+ ); - return tooltip ? ( - - {badge} - - ) : ( - badge - ); -}); + return tooltip ? ( + + {badge} + + ) : ( + badge + ); + } +); BadgeComponent.displayName = 'Badge'; const BadgeSkeleton: SkeletonComponent = ({ rootProps }) => { diff --git a/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.tsx b/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.tsx index 28a668e25b0..9e4d9a2a66a 100644 --- a/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.tsx +++ b/public/app/features/alerting/unified/components/expressions/ExpressionStatusIndicator.tsx @@ -17,16 +17,27 @@ export const ExpressionStatusIndicator = ({ error, warning, isCondition, onSetCo const elements: JSX.Element[] = []; if (error && isCondition) { - return ; + return ; } else if (error) { - elements.push(); + elements.push( + + ); } if (warning && isCondition) { - return ; + return ( + + ); } else if (warning) { elements.push( - + ); }