Fix missing executionContext

elastic · Nov 21, 2024 · 3925c21 · 3925c21
1 parent d91d82c
commit 3925c21
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/packages/react/kibana_context/root/root_provider.test.tsx b/packages/react/kibana_context/root/root_provider.test.tsx
@@ -17,6 +17,8 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import type { KibanaTheme } from '@kbn/react-kibana-context-common';
 import type { AnalyticsServiceStart } from '@kbn/core-analytics-browser';
 import { analyticsServiceMock } from '@kbn/core-analytics-browser-mocks';
+import type { ExecutionContextStart } from '@kbn/core-execution-context-browser';
+import { executionContextServiceMock } from '@kbn/core-execution-context-browser-mocks';
 import { i18nServiceMock } from '@kbn/core-i18n-browser-mocks';
 import { KibanaRootContextProvider } from './root_provider';
 import { I18nStart } from '@kbn/core-i18n-browser';
@@ -25,11 +27,13 @@ describe('KibanaRootContextProvider', () => {
   let euiTheme: UseEuiTheme | undefined;
   let i18nMock: I18nStart;
   let analytics: AnalyticsServiceStart;
+  let executionContext: ExecutionContextStart;
 
   beforeEach(() => {
     euiTheme = undefined;
     analytics = analyticsServiceMock.createAnalyticsServiceStart();
     i18nMock = i18nServiceMock.createStartContract();
+    executionContext = executionContextServiceMock.createStartContract();
   });
 
   const flushPromises = async () => {
@@ -64,6 +68,7 @@ describe('KibanaRootContextProvider', () => {
       <KibanaRootContextProvider
         analytics={analytics}
         i18n={i18nMock}
+        executionContext={executionContext}
         theme={{ theme$: of(coreTheme) }}
       >
         <InnerComponent />
@@ -82,6 +87,7 @@ describe('KibanaRootContextProvider', () => {
       <KibanaRootContextProvider
         analytics={analytics}
         i18n={i18nMock}
+        executionContext={executionContext}
         theme={{ theme$: coreTheme$ }}
       >
         <InnerComponent />

diff --git a/packages/react/kibana_context/root/root_provider.tsx b/packages/react/kibana_context/root/root_provider.tsx
@@ -11,6 +11,8 @@ import React, { FC, PropsWithChildren } from 'react';
 
 import type { AnalyticsServiceStart } from '@kbn/core-analytics-browser';
 import type { I18nStart } from '@kbn/core-i18n-browser';
+import { SharedUXContext } from '@kbn/shared-ux-router/services';
+import type { ExecutionContextStart } from '@kbn/core-execution-context-browser';
 
 // @ts-expect-error EUI exports this component internally, but Kibana isn't picking it up its types
 import { useIsNestedEuiProvider } from '@elastic/eui/lib/components/provider/nested';
@@ -25,6 +27,8 @@ export interface KibanaRootContextProviderProps extends KibanaEuiProviderProps {
   i18n: I18nStart;
   /** The `AnalyticsServiceStart` API from `CoreStart`. */
   analytics?: Pick<AnalyticsServiceStart, 'reportEvent'>;
+  /** The `ExecutionContextStart` API from `CoreStart`. */
+  executionContext?: ExecutionContextStart;
 }
 
 /**
@@ -44,20 +48,22 @@ export interface KibanaRootContextProviderProps extends KibanaEuiProviderProps {
 export const KibanaRootContextProvider: FC<PropsWithChildren<KibanaRootContextProviderProps>> = ({
   children,
   i18n,
+  executionContext,
   ...props
 }) => {
   const hasEuiProvider = useIsNestedEuiProvider();
+  const rootContextProvider = (
+    <SharedUXContext.Provider value={{ services: { executionContext } }}>
+      <i18n.Context>{children}</i18n.Context>
+    </SharedUXContext.Provider>
+  );
 
   if (hasEuiProvider) {
     emitEuiProviderWarning(
       'KibanaRootContextProvider has likely been nested in this React tree, either by direct reference or by KibanaRenderContextProvider.  The result of this nesting is a nesting of EuiProvider, which has negative effects.  Check your React tree for nested Kibana context providers.'
     );
-    return <i18n.Context>{children}</i18n.Context>;
+    return rootContextProvider;
   } else {
-    return (
-      <KibanaEuiProvider {...props}>
-        <i18n.Context>{children}</i18n.Context>
-      </KibanaEuiProvider>
-    );
+    return <KibanaEuiProvider {...props}>{rootContextProvider}</KibanaEuiProvider>;
   }
 };
diff --git a/packages/shared-ux/router/impl/services.ts b/packages/shared-ux/router/impl/services.ts
@@ -8,6 +8,7 @@
  */
 
 import { Observable } from 'rxjs';
+import type { ExecutionContextStart } from '@kbn/core-execution-context-browser';
 import { createContext, useContext } from 'react';
 import { SharedUXExecutionContext } from './types';
 
@@ -49,8 +50,7 @@ export interface SharedUXExecutionContextSetup {
  * https://github.com/Microsoft/web-build-tools/issues/1237
  */
 export interface SharedUXExecutionContextSetup {
-  /** {@link SharedUXExecutionContextSetup} */
-  executionContext: SharedUXExecutionContextStart;
+  executionContext: ExecutionContextStart;
 }
 
 export type KibanaServices = Partial<SharedUXExecutionContextSetup>;
@@ -63,12 +63,12 @@ const defaultContextValue = {
   services: {},
 };
 
-export const sharedUXContext =
+export const SharedUXContext =
   createContext<SharedUXRouterContextValue<KibanaServices>>(defaultContextValue);
 
 export const useKibanaSharedUX = <Extra extends object = {}>(): SharedUXRouterContextValue<
   KibanaServices & Extra
 > =>
   useContext(
-    sharedUXContext as unknown as React.Context<SharedUXRouterContextValue<KibanaServices & Extra>>
+    SharedUXContext as unknown as React.Context<SharedUXRouterContextValue<KibanaServices & Extra>>
   );
diff --git a/packages/shared-ux/router/impl/use_execution_context.ts b/packages/shared-ux/router/impl/use_execution_context.ts
@@ -8,7 +8,7 @@
  */
 
 import useDeepCompareEffect from 'react-use/lib/useDeepCompareEffect';
-import { SharedUXExecutionContextSetup } from './services';
+import type { ExecutionContextStart } from '@kbn/core-execution-context-browser';
 import { SharedUXExecutionContext } from './types';
 
 /**
@@ -17,7 +17,7 @@ import { SharedUXExecutionContext } from './types';
  * @param context
  */
 export function useSharedUXExecutionContext(
-  executionContext: SharedUXExecutionContextSetup | undefined,
+  executionContext: ExecutionContextStart | undefined,
   context: SharedUXExecutionContext
 ) {
   useDeepCompareEffect(() => {