refactor(newsfeed): moved newsfeed api call so that it is done before…

… its use
elastic · Nov 12, 2019 · 2c68980 · 2c68980
1 parent e430554
commit 2c68980
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx b/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx
@@ -29,8 +29,10 @@ export interface INewsfeedContext {
 }
 export const NewsfeedContext = React.createContext({} as INewsfeedContext);
 
-interface Props {
-  apiFetchResult: Rx.Observable<void | FetchResult | null>;
+export type NewsfeedApiFetchResult = Rx.Observable<void | FetchResult | null>;
+
+export interface Props {
+  apiFetchResult: NewsfeedApiFetchResult;
 }
 
 export const NewsfeedNavButton = ({ apiFetchResult }: Props) => {

diff --git a/src/plugins/newsfeed/public/plugin.tsx b/src/plugins/newsfeed/public/plugin.tsx
@@ -24,7 +24,7 @@ import React from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { NewsfeedPluginInjectedConfig } from '../types';
-import { NewsfeedNavButton } from './components/newsfeed_header_nav_button';
+import { NewsfeedNavButton, NewsfeedApiFetchResult } from './components/newsfeed_header_nav_button';
 import { getApi } from './lib/api';
 
 export type Setup = void;
@@ -41,27 +41,24 @@ export class NewsfeedPublicPlugin implements Plugin<Setup, Start> {
   public setup(core: CoreSetup): Setup {}
 
   public start(core: CoreStart): Start {
-    function mount(targetDomElement: HTMLElement) {
-      ReactDOM.render(
-        <I18nProvider>
-          <NewsfeedNavButton apiFetchResult={api$} />
-        </I18nProvider>,
-        targetDomElement
-      );
-      return () => ReactDOM.unmountComponentAtNode(targetDomElement);
-    }
-
+    const api$ = this.fetchNewsfeed(core);
     core.chrome.navControls.registerRight({
       order: 1000,
-      mount,
+      mount: target => this.mount(api$, target),
     });
+  }
 
+  public stop() {
+    this.stop$.next();
+  }
+
+  private fetchNewsfeed(core: CoreStart) {
     const { http, injectedMetadata } = core;
     const config = injectedMetadata.getInjectedVar(
       'newsfeed'
     ) as NewsfeedPluginInjectedConfig['newsfeed'];
 
-    const api$ = getApi(http, config, this.kibanaVersion).pipe(
+    return getApi(http, config, this.kibanaVersion).pipe(
       takeUntil(this.stop$), // stop the interval when stop method is called
       catchError(() => {
         // show a message to try again later?
@@ -71,7 +68,13 @@ export class NewsfeedPublicPlugin implements Plugin<Setup, Start> {
     );
   }
 
-  public stop() {
-    this.stop$.next();
+  private mount(api$: NewsfeedApiFetchResult, targetDomElement: HTMLElement) {
+    ReactDOM.render(
+      <I18nProvider>
+        <NewsfeedNavButton apiFetchResult={api$} />
+      </I18nProvider>,
+      targetDomElement
+    );
+    return () => ReactDOM.unmountComponentAtNode(targetDomElement);
   }
 }