Skip to content

Commit a0ddca8

Browse files
[Upgrade Assistant] Address copy feedback (#99632)
1 parent e61c666 commit a0ddca8

File tree

11 files changed

+28
-50
lines changed

11 files changed

+28
-50
lines changed

x-pack/plugins/translations/translations/ja-JP.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23915,7 +23915,6 @@
2391523915
"xpack.upgradeAssistant.checkupTab.changeFiltersShowMoreLabel": "より多く表示させるにはフィルターを変更します。",
2391623916
"xpack.upgradeAssistant.checkupTab.confirmationModal.removeButtonLabel": "削除",
2391723917
"xpack.upgradeAssistant.checkupTab.controls.filterBar.criticalButtonLabel": "致命的",
23918-
"xpack.upgradeAssistant.checkupTab.controls.filterBar.warningButtonLabel": "警告",
2391923918
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIndexLabel": "インデックス別",
2392023919
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIssueLabel": "問題別",
2392123920
"xpack.upgradeAssistant.checkupTab.deprecations.criticalActionTooltip": "アップグレード前にこの問題を解決してください。",

x-pack/plugins/translations/translations/zh-CN.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24286,7 +24286,6 @@
2428624286
"xpack.upgradeAssistant.checkupTab.changeFiltersShowMoreLabel": "更改筛选以显示更多内容。",
2428724287
"xpack.upgradeAssistant.checkupTab.confirmationModal.removeButtonLabel": "移除",
2428824288
"xpack.upgradeAssistant.checkupTab.controls.filterBar.criticalButtonLabel": "紧急",
24289-
"xpack.upgradeAssistant.checkupTab.controls.filterBar.warningButtonLabel": "警告",
2429024289
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIndexLabel": "按索引",
2429124290
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIssueLabel": "按问题",
2429224291
"xpack.upgradeAssistant.checkupTab.deprecations.criticalActionTooltip": "请解决此问题后再升级。",

x-pack/plugins/upgrade_assistant/__jest__/client_integration/kibana.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe('Kibana deprecations', () => {
7979
let modal = document.body.querySelector('[data-test-subj="stepsModal"]');
8080

8181
expect(modal).not.toBe(null);
82-
expect(modal!.textContent).toContain(`Fix '${deprecation.domainId}'`);
82+
expect(modal!.textContent).toContain(`Resolve deprecation in '${deprecation.domainId}'`);
8383

8484
const steps: NodeListOf<Element> | null = modal!.querySelectorAll(
8585
'[data-test-subj="fixDeprecationSteps"] .euiStep'
@@ -127,7 +127,7 @@ describe('Kibana deprecations', () => {
127127
let modal = document.body.querySelector('[data-test-subj="resolveModal"]');
128128

129129
expect(modal).not.toBe(null);
130-
expect(modal!.textContent).toContain(`Resolve '${deprecation.domainId}'`);
130+
expect(modal!.textContent).toContain(`Resolve deprecation in '${deprecation.domainId}'`);
131131

132132
const confirmButton: HTMLButtonElement | null = modal!.querySelector(
133133
'[data-test-subj="confirmModalConfirmButton"]'

x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ const i18nTexts = {
3333
defaultMessage: 'Kibana',
3434
}),
3535
pageDescription: i18n.translate('xpack.upgradeAssistant.kibanaDeprecations.pageDescription', {
36-
defaultMessage: 'Some Kibana issues may require your attention. Resolve them before upgrading.',
36+
defaultMessage:
37+
'Review the issues listed here and make the necessary changes before upgrading. Critical issues must be resolved before you upgrade.',
3738
}),
3839
docLinkText: i18n.translate('xpack.upgradeAssistant.kibanaDeprecations.docLinkText', {
3940
defaultMessage: 'Documentation',

x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/resolve_deprecation_modal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const i18nTexts = {
2323
i18n.translate(
2424
'xpack.upgradeAssistant.kibanaDeprecations.resolveConfirmationModal.modalTitle',
2525
{
26-
defaultMessage: "Resolve '{domainId}'?",
26+
defaultMessage: "Resolve deprecation in '{domainId}'?",
2727
values: {
2828
domainId,
2929
},

x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/steps_modal.tsx

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { i18n } from '@kbn/i18n';
1111
import {
1212
EuiText,
1313
EuiSteps,
14-
EuiSpacer,
1514
EuiButton,
1615
EuiModal,
1716
EuiModalBody,
@@ -38,7 +37,7 @@ interface Props {
3837
const i18nTexts = {
3938
getModalTitle: (domainId: string) =>
4039
i18n.translate('xpack.upgradeAssistant.kibanaDeprecations.stepsModal.modalTitle', {
41-
defaultMessage: "Fix '{domainId}'",
40+
defaultMessage: "Resolve deprecation in '{domainId}'",
4241
values: {
4342
domainId,
4443
},
@@ -50,12 +49,6 @@ const i18nTexts = {
5049
step,
5150
},
5251
}),
53-
modalDescription: i18n.translate(
54-
'xpack.upgradeAssistant.kibanaDeprecations.stepsModal.modalDescription',
55-
{
56-
defaultMessage: 'Follow the steps below to address this deprecation.',
57-
}
58-
),
5952
docLinkLabel: i18n.translate(
6053
'xpack.upgradeAssistant.kibanaDeprecations.stepsModal.docLinkLabel',
6154
{
@@ -84,28 +77,20 @@ export const StepsModal: FunctionComponent<Props> = ({ closeModal, modalContent
8477
</EuiModalHeader>
8578

8679
<EuiModalBody>
87-
<>
88-
<EuiText>
89-
<p>{i18nTexts.modalDescription}</p>
90-
</EuiText>
91-
92-
<EuiSpacer />
93-
94-
<EuiSteps
95-
titleSize="xs"
96-
data-test-subj="fixDeprecationSteps"
97-
steps={steps.map((step, index) => {
98-
return {
99-
title: i18nTexts.getStepTitle(index + 1),
100-
children: (
101-
<EuiText>
102-
<p>{step}</p>
103-
</EuiText>
104-
),
105-
};
106-
})}
107-
/>
108-
</>
80+
<EuiSteps
81+
titleSize="xs"
82+
data-test-subj="fixDeprecationSteps"
83+
steps={steps.map((step, index) => {
84+
return {
85+
title: i18nTexts.getStepTitle(index + 1),
86+
children: (
87+
<EuiText>
88+
<p>{step}</p>
89+
</EuiText>
90+
),
91+
};
92+
})}
93+
/>
10994
</EuiModalBody>
11095

11196
<EuiModalFooter>

x-pack/plugins/upgrade_assistant/public/application/components/shared/health.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import { COLOR_MAP, REVERSE_LEVEL_MAP } from '../constants';
1616

1717
const LocalizedLevels: { [level: string]: string } = {
1818
warning: i18n.translate('xpack.upgradeAssistant.checkupTab.deprecations.warningLabel', {
19-
defaultMessage: 'warning',
19+
defaultMessage: 'Warning',
2020
}),
2121
critical: i18n.translate('xpack.upgradeAssistant.checkupTab.deprecations.criticalLabel', {
22-
defaultMessage: 'critical',
22+
defaultMessage: 'Critical',
2323
}),
2424
};
2525

x-pack/plugins/upgrade_assistant/public/application/components/shared/search_bar/__snapshots__/group_by_filter.test.tsx.snap

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugins/upgrade_assistant/public/application/components/shared/search_bar/__snapshots__/level_filter.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugins/upgrade_assistant/public/application/components/shared/search_bar/group_by_filter.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import { GroupByOption } from '../../types';
1414

1515
const LocalizedOptions: { [option: string]: string } = {
1616
message: i18n.translate('xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIssueLabel', {
17-
defaultMessage: 'by issue',
17+
defaultMessage: 'By issue',
1818
}),
1919
index: i18n.translate('xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIndexLabel', {
20-
defaultMessage: 'by index',
20+
defaultMessage: 'By index',
2121
}),
2222
};
2323

0 commit comments

Comments
 (0)