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

quick ILM fixes #26966

Merged
merged 3 commits into from
Dec 11, 2018
Merged

quick ILM fixes #26966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
809ee6e
fix fatal IE 11 error with undefined TextEncoder
bmcconaghy Dec 11, 2018
15499c8
fixing validation issue with hot phase
bmcconaghy Dec 11, 2018
6488ae8
fixing double scroll bar on IE11
bmcconaghy Dec 11, 2018
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
1 change: 0 additions & 1 deletion x-pack/plugins/index_lifecycle_management/public/_index_lifecycle_management.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.policyTable__horizontalScrollContainer {
overflow-x: auto;
max-width: 100%;
height: 100vh;
}
.policyTable__horizontalScroll {
min-width: 800px;
Expand Down
7 changes: 1 addition & 6 deletions x-pack/plugins/index_lifecycle_management/public/store/selectors/lifecycle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export const validateLifecycle = state => {
if (policyName.includes(' ')) {
errors[STRUCTURE_POLICY_NAME].push(policyNameContainsSpaceErrorMessage);
}
if (TextEncoder && new TextEncoder('utf-8').encode(policyName).length > 255) {
if (window.TextEncoder && new window.TextEncoder('utf-8').encode(policyName).length > 255) {
errors[STRUCTURE_POLICY_NAME].push(policyNameTooLongErrorMessage);
}
}
Expand Down Expand Up @@ -204,11 +204,6 @@ export const getLifecycle = state => {
accum[phaseName] = phaseToES(state, phase);

// These seem to be constants
// TODO: verify this assumption
if (phaseName === PHASE_HOT) {
accum[phaseName].min_age = '0s';
}

if (phaseName === PHASE_DELETE) {
accum[phaseName].actions = {
...accum[phaseName].actions,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/index_lifecycle_management/public/store/selectors/policies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ export const phaseToES = (state, phase) => {
if (!phase[PHASE_ENABLED]) {
return esPhase;
}

if (isNumber(phase[PHASE_ROLLOVER_MINIMUM_AGE])) {
esPhase.min_age = `${phase[PHASE_ROLLOVER_MINIMUM_AGE]}${phase[PHASE_ROLLOVER_MINIMUM_AGE_UNITS]}`;
}
Expand Down Expand Up @@ -269,5 +268,6 @@ export const phaseToES = (state, phase) => {
number_of_shards: phase[PHASE_PRIMARY_SHARD_COUNT]
};
}
console.log("PHASE", phase);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to remove the console.log()

return esPhase;
};