diff --git a/packages/grafana-ui/src/components/Card/Card.tsx b/packages/grafana-ui/src/components/Card/Card.tsx index f5056e9b232..91ce47f71d7 100644 --- a/packages/grafana-ui/src/components/Card/Card.tsx +++ b/packages/grafana-ui/src/components/Card/Card.tsx @@ -47,17 +47,7 @@ const CardContext = React.createContext<{ * * @public */ -export const Card: CardInterface = ({ - disabled, - href, - onClick, - children, - heading: deprecatedHeading, - description: deprecatedDescription, - isSelected, - className, - ...htmlProps -}) => { +export const Card: CardInterface = ({ disabled, href, onClick, children, isSelected, className, ...htmlProps }) => { const hasHeadingComponent = useMemo( () => React.Children.toArray(children).some( @@ -81,8 +71,6 @@ export const Card: CardInterface = ({ > {!hasHeadingComponent && } - {deprecatedHeading && {deprecatedHeading}} - {deprecatedDescription && {deprecatedDescription}} {children} @@ -93,9 +81,6 @@ interface ChildProps { className?: string; disabled?: boolean; children?: React.ReactNode; - - /** @deprecated Use `className` to add new styles */ - styles?: ReturnType; } /** Main heading for the card */ diff --git a/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx b/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx index 17a7140bc80..a6e28db3a5e 100644 --- a/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx @@ -313,12 +313,11 @@ const DatasourceNotFound = ({ index, onUpdateDatasource, onRemoveQuery, model }: return ( - + + This datasource has been removed + + The datasource for this query was not found, it was either removed or is not installed correctly. +