Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ILM] Copy update #91100

Merged
merged 4 commits into from
Feb 15, 2021
Merged

[ILM] Copy update #91100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
642e125
Added copy adjustments, fixed wrong capitalization of titles and swap…
yuliacech Feb 11, 2021
5813d19
Merge branch 'master' into ilm_copy
kibanamachine Feb 15, 2021
c806392
Apply suggestions from code review
yuliacech Feb 15, 2021
d2f49db
Fixed eslint issues and added labels for buttons
yuliacech Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x-pack/plugins/index_lifecycle_management/__jest__/client_integration/app/app.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const PERCENT_SIGN_NAME = 'test%';
const PERCENT_SIGN_WITH_OTHER_CHARS_NAME = 'test%#';
const PERCENT_SIGN_25_SEQUENCE = 'test%25';

const createPolicyTitle = 'Create Policy';
const editPolicyTitle = 'Edit Policy';
const createPolicyTitle = 'Create policy';
const editPolicyTitle = 'Edit policy';

window.scrollTo = jest.fn();

Expand Down
4 changes: 2 additions & 2 deletions ...nagement/public/application/sections/edit_policy/components/phase_footer/phase_footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ export const PhaseFooter: FunctionComponent<Props> = ({ phase }) => {

const phaseDescription = isDeletePhaseEnabled
? i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseTiming.beforeDeleteDescription', {
defaultMessage: 'Data will be deleted after this phase',
defaultMessage: 'Policy deletes data after this phase',
yuliacech marked this conversation as resolved.
Show resolved Hide resolved
})
: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseTiming.foreverTimingDescription', {
defaultMessage: 'Data will remain in this phase forever',
defaultMessage: 'Data remains in this phase forever',
jrodewig marked this conversation as resolved.
Show resolved Hide resolved
yuliacech marked this conversation as resolved.
Show resolved Hide resolved
});

const selectedButton = isDeletePhaseEnabled
Expand Down
2 changes: 1 addition & 1 deletion ...cycle_management/public/application/sections/edit_policy/components/timeline/timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const SCORE_BUFFER_AMOUNT = 50;

const i18nTexts = {
title: i18n.translate('xpack.indexLifecycleMgmt.timeline.title', {
defaultMessage: 'Policy Summary',
defaultMessage: 'Policy summary',
}),
description: i18n.translate('xpack.indexLifecycleMgmt.timeline.description', {
defaultMessage: 'This policy moves data through the following phases.',
Expand Down
54 changes: 27 additions & 27 deletions ...lugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ export const EditPolicy: React.FunctionComponent<Props> = ({ history }) => {
<h1>
{isNewPolicy
? i18n.translate('xpack.indexLifecycleMgmt.editPolicy.createPolicyMessage', {
defaultMessage: 'Create Policy',
defaultMessage: 'Create policy',
})
: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.editPolicyMessage', {
defaultMessage: 'Edit Policy {originalPolicyName}',
defaultMessage: 'Edit policy {originalPolicyName}',
values: { originalPolicyName },
})}
</h1>
Expand Down Expand Up @@ -258,33 +258,8 @@ export const EditPolicy: React.FunctionComponent<Props> = ({ history }) => {
<FormErrorsCallout />

<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<EuiButtonEmpty onClick={togglePolicyJsonFlyout} data-test-subj="requestButton">
{isShowingPolicyJsonFlyout ? (
<FormattedMessage
id="xpack.indexLifecycleMgmt.editPolicy.hidePolicyJsonButto"
defaultMessage="Hide request"
/>
) : (
<FormattedMessage
id="xpack.indexLifecycleMgmt.editPolicy.showPolicyJsonButto"
defaultMessage="Show request"
/>
)}
</EuiButtonEmpty>
</EuiFlexItem>

<EuiFlexItem grow={false}>
<EuiFlexGroup>
<EuiFlexItem grow={false}>
<EuiButtonEmpty data-test-subj="cancelTestPolicy" onClick={backToPolicyList}>
<FormattedMessage
id="xpack.indexLifecycleMgmt.editPolicy.cancelButton"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
</EuiFlexItem>

<EuiFlexItem grow={false}>
<EuiButton
data-test-subj="savePolicyButton"
Expand All @@ -307,8 +282,33 @@ export const EditPolicy: React.FunctionComponent<Props> = ({ history }) => {
)}
</EuiButton>
</EuiFlexItem>

<EuiFlexItem grow={false}>
<EuiButtonEmpty data-test-subj="cancelTestPolicy" onClick={backToPolicyList}>
<FormattedMessage
id="xpack.indexLifecycleMgmt.editPolicy.cancelButton"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>

<EuiFlexItem grow={false}>
<EuiButtonEmpty onClick={togglePolicyJsonFlyout} data-test-subj="requestButton">
{isShowingPolicyJsonFlyout ? (
<FormattedMessage
id="xpack.indexLifecycleMgmt.editPolicy.hidePolicyJsonButto"
defaultMessage="Hide request"
/>
) : (
<FormattedMessage
id="xpack.indexLifecycleMgmt.editPolicy.showPolicyJsonButto"
defaultMessage="Show request"
/>
)}
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexGroup>

{isShowingPolicyJsonFlyout ? (
Expand Down
10 changes: 5 additions & 5 deletions .../plugins/index_lifecycle_management/public/application/sections/edit_policy/i18n_texts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,27 +189,27 @@ export const i18nTexts = {
defaultMessage: 'Cold phase',
}),
delete: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.deletePhase.deletePhaseTitle', {
defaultMessage: 'Delete Data',
defaultMessage: 'Delete data',
yuliacech marked this conversation as resolved.
Show resolved Hide resolved
}),
},
descriptions: {
hot: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseDescription', {
defaultMessage:
'You actively store and query data in the hot phase. All policies have a hot phase.',
'You store and query your data on hot nodes, your most performant hardware. Highest search speed for the biggest cost.',
jrodewig marked this conversation as resolved.
Show resolved Hide resolved
yuliacech marked this conversation as resolved.
Show resolved Hide resolved
}),
warm: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.warmPhase.warmPhaseDescription', {
defaultMessage:
'You are still querying your index, but it is read-only. You can allocate shards to less performant hardware. For faster searches, you can reduce the number of shards and force merge segments.',
'Your data is read-only and you query it on warm nodes, less performant hardware. Slightly slower search for the smaller cost.',
jrodewig marked this conversation as resolved.
Show resolved Hide resolved
yuliacech marked this conversation as resolved.
Show resolved Hide resolved
}),
cold: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.coldPhase.coldPhaseDescription', {
defaultMessage:
'You are querying your index less frequently, so you can allocate shards on significantly less performant hardware. Because your queries are slower, you can reduce the number of replicas.',
'You query your data less frequently and move it to cold nodes, your significantly less performant hardware. Slower search for the cheapest cost.',
jrodewig marked this conversation as resolved.
Show resolved Hide resolved
yuliacech marked this conversation as resolved.
Show resolved Hide resolved
}),
delete: i18n.translate(
'xpack.indexLifecycleMgmt.editPolicy.deletePhase.deletePhaseDescription',
{
defaultMessage:
'You no longer need your index. You can define when it is safe to delete it.',
'You no longer need your data. You can define when it is safe to delete it.',
jrodewig marked this conversation as resolved.
Show resolved Hide resolved
yuliacech marked this conversation as resolved.
Show resolved Hide resolved
}
),
},
Expand Down