diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx
index 1c9a079bcf1eba..772d558a0d20dd 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.test.tsx
@@ -5,9 +5,9 @@
*/
import React from 'react';
-import { shallowWithIntl } from '@kbn/test/jest';
+import { shallow } from 'enzyme';
-import { IndexDeprecationTableProps, IndexDeprecationTableUI } from './index_table';
+import { IndexDeprecationTableProps, IndexDeprecationTable } from './index_table';
describe('IndexDeprecationTable', () => {
const defaultProps = {
@@ -22,7 +22,7 @@ describe('IndexDeprecationTable', () => {
// This test simply verifies that the props passed to EuiBaseTable are the ones
// expected.
test('render', () => {
- expect(shallowWithIntl()).toMatchInlineSnapshot(`
+ expect(shallow()).toMatchInlineSnapshot(`
{
@@ -51,24 +51,27 @@ export class IndexDeprecationTableUI extends React.Component<
}
public render() {
- const { intl } = this.props;
const { pageIndex, pageSize, sortField, sortDirection } = this.state;
const columns = [
{
field: 'index',
- name: intl.formatMessage({
- id: 'xpack.upgradeAssistant.checkupTab.deprecations.indexTable.indexColumnLabel',
- defaultMessage: 'Index',
- }),
+ name: i18n.translate(
+ 'xpack.upgradeAssistant.checkupTab.deprecations.indexTable.indexColumnLabel',
+ {
+ defaultMessage: 'Index',
+ }
+ ),
sortable: true,
},
{
field: 'details',
- name: intl.formatMessage({
- id: 'xpack.upgradeAssistant.checkupTab.deprecations.indexTable.detailsColumnLabel',
- defaultMessage: 'Details',
- }),
+ name: i18n.translate(
+ 'xpack.upgradeAssistant.checkupTab.deprecations.indexTable.detailsColumnLabel',
+ {
+ defaultMessage: 'Details',
+ }
+ ),
},
];
@@ -181,5 +184,3 @@ export class IndexDeprecationTableUI extends React.Component<
};
}
}
-
-export const IndexDeprecationTable = injectI18n(IndexDeprecationTableUI);
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/deprecation_logging_toggle.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/deprecation_logging_toggle.tsx
index 0e6c79dc47b537..7a1ffb955db5c2 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/deprecation_logging_toggle.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/deprecation_logging_toggle.tsx
@@ -7,13 +7,13 @@
import React from 'react';
import { EuiLoadingSpinner, EuiSwitch } from '@elastic/eui';
-import { injectI18n } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
import { HttpSetup } from 'src/core/public';
import { LoadingState } from '../../types';
-interface DeprecationLoggingTabProps extends ReactIntl.InjectedIntlProps {
+interface DeprecationLoggingTabProps {
http: HttpSetup;
}
@@ -22,7 +22,7 @@ interface DeprecationLoggingTabState {
loggingEnabled?: boolean;
}
-export class DeprecationLoggingToggleUI extends React.Component<
+export class DeprecationLoggingToggle extends React.Component<
DeprecationLoggingTabProps,
DeprecationLoggingTabState
> {
@@ -59,27 +59,29 @@ export class DeprecationLoggingToggleUI extends React.Component<
}
private renderLoggingState() {
- const { intl } = this.props;
const { loggingEnabled, loadingState } = this.state;
if (loadingState === LoadingState.Error) {
- return intl.formatMessage({
- id:
- 'xpack.upgradeAssistant.overviewTab.steps.deprecationLogsStep.enableDeprecationLoggingToggleSwitch.errorLabel',
- defaultMessage: 'Could not load logging state',
- });
+ return i18n.translate(
+ 'xpack.upgradeAssistant.overviewTab.steps.deprecationLogsStep.enableDeprecationLoggingToggleSwitch.errorLabel',
+ {
+ defaultMessage: 'Could not load logging state',
+ }
+ );
} else if (loggingEnabled) {
- return intl.formatMessage({
- id:
- 'xpack.upgradeAssistant.overviewTab.steps.deprecationLogsStep.enableDeprecationLoggingToggleSwitch.enabledLabel',
- defaultMessage: 'On',
- });
+ return i18n.translate(
+ 'xpack.upgradeAssistant.overviewTab.steps.deprecationLogsStep.enableDeprecationLoggingToggleSwitch.enabledLabel',
+ {
+ defaultMessage: 'On',
+ }
+ );
} else {
- return intl.formatMessage({
- id:
- 'xpack.upgradeAssistant.overviewTab.steps.deprecationLogsStep.enableDeprecationLoggingToggleSwitch.disabledLabel',
- defaultMessage: 'Off',
- });
+ return i18n.translate(
+ 'xpack.upgradeAssistant.overviewTab.steps.deprecationLogsStep.enableDeprecationLoggingToggleSwitch.disabledLabel',
+ {
+ defaultMessage: 'Off',
+ }
+ );
}
}
@@ -117,5 +119,3 @@ export class DeprecationLoggingToggleUI extends React.Component<
}
};
}
-
-export const DeprecationLoggingToggle = injectI18n(DeprecationLoggingToggleUI);
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/steps.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/steps.tsx
index 1a1ea48a350c8c..dd392f6d1b2946 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/steps.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/tabs/overview/steps.tsx
@@ -17,7 +17,7 @@ import {
EuiText,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
+import { FormattedMessage } from '@kbn/i18n/react';
import { CURRENT_MAJOR_VERSION, NEXT_MAJOR_VERSION } from '../../../../../common/version';
import { UpgradeAssistantTabProps } from '../../types';
@@ -89,10 +89,9 @@ const START_UPGRADE_STEP = (isCloudEnabled: boolean, esDocBasePath: string) => (
),
});
-export const StepsUI: FunctionComponent = ({
+export const Steps: FunctionComponent = ({
checkupData,
setSelectedTabIndex,
- intl,
}) => {
const checkupDataTyped = (checkupData! as unknown) as { [checkupType: string]: any[] };
const countByType = Object.keys(checkupDataTyped).reduce((counts, checkupType) => {
@@ -113,15 +112,18 @@ export const StepsUI: FunctionComponent
@@ -168,15 +170,18 @@ export const StepsUI: FunctionComponent
@@ -222,10 +227,12 @@ export const StepsUI: FunctionComponent
@@ -256,11 +263,12 @@ export const StepsUI: FunctionComponent
@@ -276,5 +284,3 @@ export const StepsUI: FunctionComponent
);
};
-
-export const Steps = injectI18n(StepsUI);