Merge branch 'main' into fix/metric-migrations

elastic · Jun 13, 2023 · 95023fe · 95023fe
2 parents ae79174 + 7b1d473
commit 95023fe
Show file tree

Hide file tree

Showing 31 changed files with 848 additions and 671 deletions.
diff --git a/packages/kbn-test-jest-helpers/src/enzyme_helpers.tsx b/packages/kbn-test-jest-helpers/src/enzyme_helpers.tsx
@@ -15,7 +15,7 @@
 
 import { I18nProvider, InjectedIntl, intlShape, __IntlProvider } from '@kbn/i18n-react';
 import { mount, ReactWrapper, render, shallow } from 'enzyme';
-import React, { ReactElement, ValidationMap } from 'react';
+import React, { ComponentType, ReactElement, ValidationMap } from 'react';
 import { act as reactAct } from 'react-dom/test-utils';
 
 // Use fake component to extract `intl` property to use in tests.
@@ -94,6 +94,8 @@ export function mountWithIntl<T>(
     attachTo?: HTMLElement;
     context?: any;
     childContextTypes?: ValidationMap<any>;
+    wrappingComponent?: ComponentType<any> | undefined;
+    wrappingComponentProps?: {} | undefined;
   } = {}
 ) {
   const options = getOptions(context, childContextTypes, props);

diff --git a/src/plugins/chart_expressions/expression_metric/public/components/currency_codes.test.ts b/src/plugins/chart_expressions/expression_metric/public/components/currency_codes.test.ts
diff --git a/src/plugins/chart_expressions/expression_metric/public/components/currency_codes.ts b/src/plugins/chart_expressions/expression_metric/public/components/currency_codes.ts