Update WorkplaceSearch to render its header actions from app, not plu…

…gin.ts
elastic · Sep 28, 2020 · 6925b13 · 6925b13
1 parent 4fc393d
commit 6925b13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -14,7 +14,7 @@ import { KibanaLogic } from '../shared/kibana';
 import { HttpLogic } from '../shared/http';
 import { AppLogic } from './app_logic';
 import { Layout } from '../shared/layout';
-import { WorkplaceSearchNav } from './components/layout/nav';
+import { WorkplaceSearchNav, WorkplaceSearchHeaderActions } from './components/layout';
 
 import { SETUP_GUIDE_PATH } from './routes';
 
@@ -31,10 +31,14 @@ export const WorkplaceSearch: React.FC<IInitialAppData> = (props) => {
 export const WorkplaceSearchConfigured: React.FC<IInitialAppData> = (props) => {
   const { hasInitialized } = useValues(AppLogic);
   const { initializeAppData } = useActions(AppLogic);
+  const { renderHeaderActions } = useValues(KibanaLogic);
   const { errorConnecting, readOnlyMode } = useValues(HttpLogic);
 
   useEffect(() => {
-    if (!hasInitialized) initializeAppData(props);
+    if (!hasInitialized) {
+      initializeAppData(props);
+      renderHeaderActions(WorkplaceSearchHeaderActions);
+    }
   }, [hasInitialized]);
 
   return (

diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts
@@ -106,16 +106,9 @@ export class EnterpriseSearchPlugin implements Plugin {
         await this.getInitialData(http);
         const pluginData = this.getPluginData();
 
-        const { renderApp, renderHeaderActions } = await import('./applications');
+        const { renderApp } = await import('./applications');
         const { WorkplaceSearch } = await import('./applications/workplace_search');
 
-        const { WorkplaceSearchHeaderActions } = await import(
-          './applications/workplace_search/components/layout'
-        );
-        params.setHeaderActionMenu((element) =>
-          renderHeaderActions(WorkplaceSearchHeaderActions, element)
-        );
-
         return renderApp(WorkplaceSearch, kibanaDeps, pluginData);
       },
     });