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

[NP migration] Shim ILM #56068

Merged
merged 18 commits into from
Feb 5, 2020
Merged

[NP migration] Shim ILM #56068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
67066a1
Shim ILM server.
cjcenizal Jan 27, 2020
a406f30
Convert server-side code to TS, largely with use of any.
cjcenizal Jan 28, 2020
b4e6902
Use real CoreSetup and extract shimmed dependencies into __LEGACY par…
cjcenizal Jan 28, 2020
cc1e3a8
Reorder client-side imports to isolate dependencies that require shim…
cjcenizal Jan 28, 2020
e9fa60a
Shim public directory with a np_ready subdirectory.
cjcenizal Feb 1, 2020
adc84b2
Consume NP http service.
cjcenizal Feb 3, 2020
0b9e0ab
Rename boot function to renderApp.
cjcenizal Feb 3, 2020
154db30
Migrate to NP fatalErrors service.
cjcenizal Feb 3, 2020
e46dad1
Add some comments about future migrations.
cjcenizal Feb 3, 2020
225bf51
Inject NP http service into Index Management extensions. Remove depen…
cjcenizal Feb 4, 2020
1fb3a78
Address PR feedback and fix TS errors.
cjcenizal Feb 4, 2020
7725b5b
Merge branch 'master' of github.com:elastic/kibana into chore/ilm-to-…
cjcenizal Feb 4, 2020
a66b2a5
Merge branch 'master' into chore/ilm-to-np-shim
elasticmachine Feb 5, 2020
ec6c117
Fix extend_index_lifecycle_management tests.
cjcenizal Feb 5, 2020
2801485
Merge branch 'master' of github.com:elastic/kibana into chore/ilm-to-…
cjcenizal Feb 5, 2020
c06c10f
Merge branch 'master' into chore/ilm-to-np-shim
elasticmachine Feb 5, 2020
c729fa7
Merge branch 'master' into chore/ilm-to-np-shim
elasticmachine Feb 5, 2020
bb7706f
Update snapshots.
cjcenizal Feb 5, 2020
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
12 changes: 6 additions & 6 deletions ...ns/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 15 additions & 7 deletions x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
import React from 'react';
import moment from 'moment-timezone';
import { Provider } from 'react-redux';
import { fetchedPolicies, fetchedNodes } from '../../public/store/actions';
import { indexLifecycleManagementStore } from '../../public/store';
import { mountWithIntl } from '../../../../../test_utils/enzyme_helpers';
import { EditPolicy } from '../../public/sections/edit_policy';
// axios has a $http like interface so using it to simulate $http
import axios from 'axios';
import axiosXhrAdapter from 'axios/lib/adapters/xhr';
import { setHttpClient } from '../../public/services/api';
setHttpClient(axios.create({ adapter: axiosXhrAdapter }));
import sinon from 'sinon';
import { findTestSubject } from '@elastic/eui/lib/test';

import { mountWithIntl } from '../../../../../test_utils/enzyme_helpers';
import { fetchedPolicies, fetchedNodes } from '../../public/np_ready/application/store/actions';
import { indexLifecycleManagementStore } from '../../public/np_ready/application/store';
import { EditPolicy } from '../../public/np_ready/application/sections/edit_policy';
import { init as initHttp } from '../../public/np_ready/application/services/http';
import { init as initUiMetric } from '../../public/np_ready/application/services/ui_metric';
import { init as initNotification } from '../../public/np_ready/application/services/notification';
import {
positiveNumbersAboveZeroErrorMessage,
positiveNumberRequiredMessage,
Expand All @@ -31,7 +33,13 @@ import {
policyNameMustBeDifferentErrorMessage,
policyNameAlreadyUsedErrorMessage,
maximumDocumentsRequiredMessage,
} from '../../public/store/selectors/lifecycle';
} from '../../public/np_ready/application/store/selectors/lifecycle';

initHttp(axios.create({ adapter: axiosXhrAdapter }), path => path);
initUiMetric(() => () => {});
initNotification({
addDanger: () => {},
});

jest.mock('ui/new_platform');

Expand Down
20 changes: 13 additions & 7 deletions x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,24 @@
import moment from 'moment-timezone';
import React from 'react';
import { Provider } from 'react-redux';
import { fetchedPolicies } from '../../public/store/actions';
import { indexLifecycleManagementStore } from '../../public/store';
import { mountWithIntl } from '../../../../../test_utils/enzyme_helpers';
import { PolicyTable } from '../../public/sections/policy_table';
import { findTestSubject, takeMountedSnapshot } from '@elastic/eui/lib/test';
// axios has a $http like interface so using it to simulate $http
import axios from 'axios';
import axiosXhrAdapter from 'axios/lib/adapters/xhr';
import { setHttpClient } from '../../public/services/api';
setHttpClient(axios.create({ adapter: axiosXhrAdapter }));
import sinon from 'sinon';
import { findTestSubject, takeMountedSnapshot } from '@elastic/eui/lib/test';

import { mountWithIntl } from '../../../../../test_utils/enzyme_helpers';
import { fetchedPolicies } from '../../public/np_ready/application/store/actions';
import { indexLifecycleManagementStore } from '../../public/np_ready/application/store';
import { PolicyTable } from '../../public/np_ready/application/sections/policy_table';
import { init as initHttp } from '../../public/np_ready/application/services/http';
import { init as initUiMetric } from '../../public/np_ready/application/services/ui_metric';

initHttp(axios.create({ adapter: axiosXhrAdapter }), path => path);
initUiMetric(() => () => {});

jest.mock('ui/new_platform');

let server = null;

let store = null;
Expand Down
Loading