Post merge updates

public/app/features/dashboard/dashgrid/DataPanel.tsx

 // Library
 // Library
 import React, { Component } from 'react';
 import React, { Component } from 'react';
-import Tooltip from 'app/core/components/Tooltip/Tooltip';
+import { Tooltip } from '@grafana/ui';
+import { Themes } from '@grafana/ui/src/components/Tooltip/Popper';
+
 import ErrorBoundary from 'app/core/components/ErrorBoundary/ErrorBoundary';
 import ErrorBoundary from 'app/core/components/ErrorBoundary/ErrorBoundary';
 
 
 // Services
 // Services
@@ -12,7 +14,6 @@ import kbn from 'app/core/utils/kbn';
 // Types
 // Types
 import { DataQueryOptions, DataQueryResponse } from 'app/types';
 import { DataQueryOptions, DataQueryResponse } from 'app/types';
 import { TimeRange, TimeSeries, LoadingState } from '@grafana/ui';
 import { TimeRange, TimeSeries, LoadingState } from '@grafana/ui';
-import { Themes } from 'app/core/components/Tooltip/Popper';
 
 
 const DEFAULT_PLUGIN_ERROR = 'Error in plugin';
 const DEFAULT_PLUGIN_ERROR = 'Error in plugin';
 
 
@@ -144,10 +145,10 @@ export class DataPanel extends Component<Props, State> {
       this.setState({
       this.setState({
         loading: LoadingState.Error,
         loading: LoadingState.Error,
         isFirstLoad: false,
         isFirstLoad: false,
-        errorMessage: errorMessage
+        errorMessage: errorMessage,
       });
       });
     }
     }
-  }
+  };
 
 
   render() {
   render() {
     const { queries } = this.props;
     const { queries } = this.props;
@@ -171,7 +172,7 @@ export class DataPanel extends Component<Props, State> {
       <>
       <>
         {this.renderLoadingStates()}
         {this.renderLoadingStates()}
         <ErrorBoundary>
         <ErrorBoundary>
-          {({error, errorInfo}) => {
+          {({ error, errorInfo }) => {
             if (errorInfo) {
             if (errorInfo) {
               this.onError(error.message || DEFAULT_PLUGIN_ERROR);
               this.onError(error.message || DEFAULT_PLUGIN_ERROR);
               return null;
               return null;
@@ -200,15 +201,11 @@ export class DataPanel extends Component<Props, State> {
       );
       );
     } else if (loading === LoadingState.Error) {
     } else if (loading === LoadingState.Error) {
       return (
       return (
-        <Tooltip
-          content={errorMessage}
-          className="popper__manager--block"
-          refClassName={`panel-info-corner panel-info-corner--error`}
-          placement="bottom-start"
-          theme={Themes.Error}
-        >
+        <Tooltip content={errorMessage} placement="bottom-start" theme={Themes.Error}>
+          <div className="panel-info-corner panel-info-corner--error">
             <i className="fa" />
             <i className="fa" />
             <span className="panel-info-corner-inner" />
             <span className="panel-info-corner-inner" />
+          </div>
         </Tooltip>
         </Tooltip>
       );
       );
     }
     }