[Discover] Close inspector when switching app (#92994)

elastic · Apr 13, 2021 · d8b4316 · d8b4316
1 parent 6ddc4bf
commit d8b4316
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/src/plugins/discover/public/application/components/discover.tsx b/src/plugins/discover/public/application/components/discover.tsx
@@ -43,6 +43,7 @@ import { DiscoverTopNav } from './discover_topnav';
 import { ElasticSearchHit } from '../doc_views/doc_views_types';
 import { setBreadcrumbsTitle } from '../helpers/breadcrumbs';
 import { addHelpMenuToAppChrome } from './help_menu/help_menu_util';
+import { InspectorSession } from '../../../../inspector/public';
 
 const DocTableLegacyMemoized = React.memo(DocTableLegacy);
 const SidebarMemoized = React.memo(DiscoverSidebarResponsive);
@@ -71,6 +72,7 @@ export function Discover({
   refreshAppState,
 }: DiscoverProps) {
   const [expandedDoc, setExpandedDoc] = useState<ElasticSearchHit | undefined>(undefined);
+  const [inspectorSession, setInspectorSession] = useState<InspectorSession | undefined>(undefined);
   const scrollableDesktop = useRef<HTMLDivElement>(null);
   const collapseIcon = useRef<HTMLButtonElement>(null);
   const isMobile = () => {
@@ -131,7 +133,20 @@ export function Discover({
   const onOpenInspector = useCallback(() => {
     // prevent overlapping
     setExpandedDoc(undefined);
-  }, [setExpandedDoc]);
+    const session = services.inspector.open(opts.inspectorAdapters, {
+      title: savedSearch.title,
+    });
+    setInspectorSession(session);
+  }, [setExpandedDoc, opts.inspectorAdapters, savedSearch, services.inspector]);
+
+  useEffect(() => {
+    return () => {
+      if (inspectorSession) {
+        // Close the inspector if this scope is destroyed (e.g. because the user navigates away).
+        inspectorSession.close();
+      }
+    };
+  }, [inspectorSession]);
 
   const onSort = useCallback(
     (sort: string[][]) => {

diff --git a/src/plugins/discover/public/application/components/discover_topnav.tsx b/src/plugins/discover/public/application/components/discover_topnav.tsx
@@ -33,7 +33,6 @@ export const DiscoverTopNav = ({
       getTopNavLinks({
         getFieldCounts: opts.getFieldCounts,
         indexPattern,
-        inspectorAdapters: opts.inspectorAdapters,
         navigateTo: opts.navigateTo,
         savedSearch: opts.savedSearch,
         services: opts.services,

diff --git a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.test.ts b/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.test.ts
@@ -8,7 +8,6 @@
 
 import { ISearchSource } from 'src/plugins/data/public';
 import { getTopNavLinks } from './get_top_nav_links';
-import { inspectorPluginMock } from '../../../../../inspector/public/mocks';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
 import { DiscoverServices } from '../../../build_services';
@@ -28,7 +27,6 @@ test('getTopNavLinks result', () => {
   const topNavLinks = getTopNavLinks({
     getFieldCounts: jest.fn(),
     indexPattern: indexPatternMock,
-    inspectorAdapters: inspectorPluginMock,
     navigateTo: jest.fn(),
     onOpenInspector: jest.fn(),
     savedSearch: savedSearchMock,

diff --git a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.ts b/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.ts
@@ -11,7 +11,6 @@ import { showOpenSearchPanel } from './show_open_search_panel';
 import { getSharingData, showPublicUrlSwitch } from '../../helpers/get_sharing_data';
 import { unhashUrl } from '../../../../../kibana_utils/public';
 import { DiscoverServices } from '../../../build_services';
-import { Adapters } from '../../../../../inspector/common/adapters';
 import { SavedSearch } from '../../../saved_searches';
 import { onSaveSearch } from './on_save_search';
 import { GetStateReturn } from '../../angular/discover_state';
@@ -23,7 +22,6 @@ import { IndexPattern, ISearchSource } from '../../../kibana_services';
 export const getTopNavLinks = ({
   getFieldCounts,
   indexPattern,
-  inspectorAdapters,
   navigateTo,
   savedSearch,
   services,
@@ -33,7 +31,6 @@ export const getTopNavLinks = ({
 }: {
   getFieldCounts: () => Promise<Record<string, number>>;
   indexPattern: IndexPattern;
-  inspectorAdapters: Adapters;
   navigateTo: (url: string) => void;
   savedSearch: SavedSearch;
   services: DiscoverServices;
@@ -127,9 +124,6 @@ export const getTopNavLinks = ({
     testId: 'openInspectorButton',
     run: () => {
       onOpenInspector();
-      services.inspector.open(inspectorAdapters, {
-        title: savedSearch.title,
-      });
     },
   };