fix discover link reload and redirect when missing helpers

elastic · May 12, 2020 · 6f6a695 · 6f6a695
1 parent af5b294
commit 6f6a695
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
@@ -17,12 +17,13 @@
  * under the License.
  */
 
-import React from 'react';
+import React, { Fragment } from 'react';
 import { History } from 'history';
 import { i18n } from '@kbn/i18n';
+import ReactDOM from 'react-dom';
+import ReactMarkdown from 'react-markdown';
 
 import { ApplicationStart, HttpStart, ToastsSetup } from 'kibana/public';
-import { MarkdownSimple, toMountPoint } from '../../../kibana_react/public';
 import { SavedObjectNotFound } from '../errors';
 
 interface Mapping {
@@ -94,7 +95,19 @@ export function redirectWhenMissing({
       title: i18n.translate('kibana_utils.history.savedObjectIsMissingNotificationMessage', {
         defaultMessage: 'Saved object is missing',
       }),
-      text: toMountPoint(<MarkdownSimple>{error.message}</MarkdownSimple>),
+      text: (element: HTMLElement) => {
+        ReactDOM.render(
+          <ReactMarkdown
+            renderers={{
+              root: Fragment,
+            }}
+          >
+            {error.message}
+          </ReactMarkdown>,
+          element
+        );
+        return () => ReactDOM.unmountComponentAtNode(element);
+      },
     });
 
     if (onBeforeRedirect) {

diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
@@ -37,6 +37,7 @@ import { i18n } from '@kbn/i18n';
 
 import { Vis } from 'src/plugins/visualizations/public';
 import { SavedSearch } from 'src/plugins/discover/public';
+import { useKibana } from '../../../../kibana_react/public';
 
 interface LinkedSearchProps {
   savedSearch: SavedSearch;
@@ -52,12 +53,21 @@ interface SidebarTitleProps {
 
 export function LinkedSearch({ savedSearch, eventEmitter }: LinkedSearchProps) {
   const [showPopover, setShowPopover] = useState(false);
+  const {
+    services: { application },
+  } = useKibana();
+
   const closePopover = useCallback(() => setShowPopover(false), []);
   const onClickButtonLink = useCallback(() => setShowPopover(v => !v), []);
   const onClickUnlikFromSavedSearch = useCallback(() => {
     setShowPopover(false);
     eventEmitter.emit('unlinkFromSavedSearch');
   }, [eventEmitter]);
+  const onClickViewInDiscover = useCallback(() => {
+    application.navigateToApp('discover', {
+      path: `#/${savedSearch.id}`,
+    });
+  }, [application, savedSearch.id]);
 
   const linkButtonAriaLabel = i18n.translate(
     'visDefaultEditor.sidebar.savedSearch.linkButtonAriaLabel',
@@ -118,7 +128,7 @@ export function LinkedSearch({ savedSearch, eventEmitter }: LinkedSearchProps) {
           <div style={{ width: 260 }}>
             <EuiText size="s">
               <p>
-                <EuiButtonEmpty flush="left" href={`discover#/${savedSearch.id}`} size="xs">
+                <EuiButtonEmpty flush="left" onClick={onClickViewInDiscover} size="xs">
                   <FormattedMessage
                     id="visDefaultEditor.sidebar.savedSearch.goToDiscoverButtonText"
                     defaultMessage="View this search in Discover"