[ILM] Clean up remaining js files and any typings

elastic · Sep 4, 2020 · 3edb736 · 3edb736
1 parent ab24ed6
commit 3edb736
Show file tree

Hide file tree

Showing 42 changed files with 162 additions and 123 deletions.
diff --git a/...k/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts b/...k/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PolicyFromES } from '../../../public/application/services/policies/types';
+import { PolicyFromES } from '../../../common/types';
 
 export const POLICY_NAME = 'my_policy';
 export const SNAPSHOT_POLICY_NAME = 'my_snapshot_policy';

diff --git a/...t/__jest__/components/edit_policy.test.js → .../__jest__/components/edit_policy.test.tsx b/...t/__jest__/components/edit_policy.test.js → .../__jest__/components/edit_policy.test.tsx
@@ -4,26 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { ReactElement } from 'react';
 import { act } from 'react-dom/test-utils';
 import moment from 'moment-timezone';
-// axios has a $http like interface so using it to simulate $http
-import axios from 'axios';
-import axiosXhrAdapter from 'axios/lib/adapters/xhr';
+
 import { findTestSubject } from '@elastic/eui/lib/test';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { SinonFakeServer } from 'sinon';
+import { ReactWrapper } from 'enzyme';
 
 import { init as initHttpRequests } from './helpers/http_requests';
 import {
   notificationServiceMock,
   fatalErrorsServiceMock,
+  injectedMetadataServiceMock,
 } from '../../../../../src/core/public/mocks';
 import { usageCollectionPluginMock } from '../../../../../src/plugins/usage_collection/public/mocks';
 
-import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
+import { HttpService } from '../../../../../src/core/public/http';
 import { EditPolicy } from '../../public/application/sections/edit_policy/edit_policy';
 import { init as initHttp } from '../../public/application/services/http';
 import { init as initUiMetric } from '../../public/application/services/ui_metric';
 import { init as initNotification } from '../../public/application/services/notification';
+import { PolicyFromES } from '../../common/types';
 import {
   positiveNumbersAboveZeroErrorMessage,
   positiveNumberRequiredMessage,
@@ -38,16 +41,28 @@ import {
   policyNameAlreadyUsedErrorMessage,
   maximumDocumentsRequiredMessage,
 } from '../../public/application/services/policies/policy_validation';
+import { HttpResponse } from './helpers/http_requests';
+import { createMemoryHistory } from 'history';
 
-initHttp(axios.create({ adapter: axiosXhrAdapter }));
+initHttp(
+  new HttpService().setup({
+    injectedMetadata: injectedMetadataServiceMock.createSetupContract(),
+    fatalErrors: fatalErrorsServiceMock.createSetupContract(),
+  })
+);
 initUiMetric(usageCollectionPluginMock.createSetupContract());
 initNotification(
   notificationServiceMock.createSetupContract().toasts,
   fatalErrorsServiceMock.createSetupContract()
 );
 
-let server;
-let httpRequestsMockHelpers;
+const history = createMemoryHistory();
+let server: SinonFakeServer;
+let httpRequestsMockHelpers: {
+  setPoliciesResponse: (response: HttpResponse) => void;
+  setNodesListResponse: (response: HttpResponse) => void;
+  setNodesDetailsResponse: (nodeAttributes: string, response: HttpResponse) => void;
+};
 const policy = {
   phases: {
     hot: {
@@ -60,32 +75,33 @@ const policy = {
     },
   },
 };
-const policies = [];
+const policies: PolicyFromES[] = [];
 for (let i = 0; i < 105; i++) {
   policies.push({
     version: i,
-    modified_date: moment().subtract(i, 'days').valueOf(),
-    linkedIndices: i % 2 === 0 ? [`index${i}`] : null,
+    modified_date: moment().subtract(i, 'days').toISOString(),
+    linkedIndices: i % 2 === 0 ? [`index${i}`] : undefined,
     name: `testy${i}`,
     policy: {
       ...policy,
+      name: `testy${i}`,
     },
   });
 }
 window.scrollTo = jest.fn();
-window.TextEncoder = null;
-let component;
-const activatePhase = async (rendered, phase) => {
+
+let component: ReactElement;
+const activatePhase = async (rendered: ReactWrapper, phase: string) => {
   const testSubject = `enablePhaseSwitch-${phase}`;
   await act(async () => {
     await findTestSubject(rendered, testSubject).simulate('click');
   });
   rendered.update();
 };
-const expectedErrorMessages = (rendered, expectedErrorMessages) => {
+const expectedErrorMessages = (rendered: ReactWrapper, expectedMessages: string[]) => {
   const errorMessages = rendered.find('.euiFormErrorText');
-  expect(errorMessages.length).toBe(expectedErrorMessages.length);
-  expectedErrorMessages.forEach((expectedErrorMessage) => {
+  expect(errorMessages.length).toBe(expectedMessages.length);
+  expectedMessages.forEach((expectedErrorMessage) => {
     let foundErrorMessage;
     for (let i = 0; i < errorMessages.length; i++) {
       if (errorMessages.at(i).text() === expectedErrorMessage) {
@@ -95,42 +111,37 @@ const expectedErrorMessages = (rendered, expectedErrorMessages) => {
     expect(foundErrorMessage).toBe(true);
   });
 };
-const noRollover = (rendered) => {
+const noRollover = (rendered: ReactWrapper) => {
   findTestSubject(rendered, 'rolloverSwitch').simulate('click');
   rendered.update();
 };
-const getNodeAttributeSelect = (rendered, phase) => {
+const getNodeAttributeSelect = (rendered: ReactWrapper, phase: string) => {
   return rendered.find(`select#${phase}-selectedNodeAttrs`);
 };
-const setPolicyName = (rendered, policyName) => {
+const setPolicyName = (rendered: ReactWrapper, policyName: string) => {
   const policyNameField = findTestSubject(rendered, 'policyNameField');
   policyNameField.simulate('change', { target: { value: policyName } });
   rendered.update();
 };
-const setPhaseAfter = (rendered, phase, after) => {
+const setPhaseAfter = (rendered: ReactWrapper, phase: string, after: string) => {
   const afterInput = rendered.find(`input#${phase}-selectedMinimumAge`);
   afterInput.simulate('change', { target: { value: after } });
   rendered.update();
 };
-const setPhaseIndexPriority = (rendered, phase, priority) => {
+const setPhaseIndexPriority = (rendered: ReactWrapper, phase: string, priority: string) => {
   const priorityInput = rendered.find(`input#${phase}-phaseIndexPriority`);
   priorityInput.simulate('change', { target: { value: priority } });
   rendered.update();
 };
-const save = (rendered) => {
+const save = (rendered: ReactWrapper) => {
   const saveButton = findTestSubject(rendered, 'savePolicyButton');
   saveButton.simulate('click');
   rendered.update();
 };
 describe('edit policy', () => {
   beforeEach(() => {
     component = (
-      <EditPolicy
-        history={{ push: () => {} }}
-        getUrlForApp={() => {}}
-        policies={policies}
-        policyName={''}
-      />
+      <EditPolicy history={history} getUrlForApp={jest.fn()} policies={policies} policyName={''} />
     );
     ({ server, httpRequestsMockHelpers } = initHttpRequests());
 
@@ -162,8 +173,8 @@ describe('edit policy', () => {
         <EditPolicy
           policyName={'testy0'}
           policies={policies}
-          getUrlForApp={() => {}}
-          history={{ push: () => {} }}
+          getUrlForApp={jest.fn()}
+          history={history}
         />
       );
       const rendered = mountWithIntl(component);
@@ -272,7 +283,7 @@ describe('edit policy', () => {
       const rendered = mountWithIntl(component);
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
-      setPhaseIndexPriority(rendered, 'hot', -1);
+      setPhaseIndexPriority(rendered, 'hot', '-1');
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
     });
@@ -300,7 +311,7 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'warm');
-      setPhaseAfter(rendered, 'warm', 0);
+      setPhaseAfter(rendered, 'warm', '0');
       save(rendered);
       expectedErrorMessages(rendered, []);
     });
@@ -309,7 +320,7 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'warm');
-      setPhaseAfter(rendered, 'warm', -1);
+      setPhaseAfter(rendered, 'warm', '-1');
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
     });
@@ -318,8 +329,8 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'warm');
-      setPhaseAfter(rendered, 'warm', 1);
-      setPhaseIndexPriority(rendered, 'warm', -1);
+      setPhaseAfter(rendered, 'warm', '1');
+      setPhaseIndexPriority(rendered, 'warm', '-1');
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
     });
@@ -330,7 +341,7 @@ describe('edit policy', () => {
       await activatePhase(rendered, 'warm');
       findTestSubject(rendered, 'shrinkSwitch').simulate('click');
       rendered.update();
-      setPhaseAfter(rendered, 'warm', 1);
+      setPhaseAfter(rendered, 'warm', '1');
       const shrinkInput = rendered.find('input#warm-selectedPrimaryShardCount');
       shrinkInput.simulate('change', { target: { value: '0' } });
       rendered.update();
@@ -342,7 +353,7 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'warm');
-      setPhaseAfter(rendered, 'warm', 1);
+      setPhaseAfter(rendered, 'warm', '1');
       findTestSubject(rendered, 'shrinkSwitch').simulate('click');
       rendered.update();
       const shrinkInput = rendered.find('input#warm-selectedPrimaryShardCount');
@@ -356,7 +367,7 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'warm');
-      setPhaseAfter(rendered, 'warm', 1);
+      setPhaseAfter(rendered, 'warm', '1');
       findTestSubject(rendered, 'forceMergeSwitch').simulate('click');
       rendered.update();
       const shrinkInput = rendered.find('input#warm-selectedForceMergeSegments');
@@ -370,7 +381,7 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'warm');
-      setPhaseAfter(rendered, 'warm', 1);
+      setPhaseAfter(rendered, 'warm', '1');
       findTestSubject(rendered, 'forceMergeSwitch').simulate('click');
       rendered.update();
       const shrinkInput = rendered.find('input#warm-selectedForceMergeSegments');
@@ -446,7 +457,7 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'cold');
-      setPhaseAfter(rendered, 'cold', 0);
+      setPhaseAfter(rendered, 'cold', '0');
       save(rendered);
       expectedErrorMessages(rendered, []);
     });
@@ -455,7 +466,7 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'cold');
-      setPhaseAfter(rendered, 'cold', -1);
+      setPhaseAfter(rendered, 'cold', '-1');
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
     });
@@ -517,8 +528,8 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'cold');
-      setPhaseAfter(rendered, 'cold', 1);
-      setPhaseIndexPriority(rendered, 'cold', -1);
+      setPhaseAfter(rendered, 'cold', '1');
+      setPhaseIndexPriority(rendered, 'cold', '-1');
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
     });
@@ -529,7 +540,7 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'delete');
-      setPhaseAfter(rendered, 'delete', 0);
+      setPhaseAfter(rendered, 'delete', '0');
       save(rendered);
       expectedErrorMessages(rendered, []);
     });
@@ -538,7 +549,7 @@ describe('edit policy', () => {
       noRollover(rendered);
       setPolicyName(rendered, 'mypolicy');
       await activatePhase(rendered, 'delete');
-      setPhaseAfter(rendered, 'delete', -1);
+      setPhaseAfter(rendered, 'delete', '-1');
       save(rendered);
       expectedErrorMessages(rendered, [positiveNumberRequiredMessage]);
     });

diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/helpers/http_requests.ts b/x-pack/plugins/index_lifecycle_management/__jest__/components/helpers/http_requests.ts
@@ -6,7 +6,7 @@
 
 import sinon, { SinonFakeServer } from 'sinon';
 
-type HttpResponse = Record<string, any> | any[];
+export type HttpResponse = Record<string, any> | any[];
 
 const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
   const setPoliciesResponse = (response: HttpResponse = []) => {

diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.tsx
@@ -17,10 +17,10 @@ import {
 import { HttpService } from '../../../../../src/core/public/http';
 import { usageCollectionPluginMock } from '../../../../../src/plugins/usage_collection/public/mocks';
 
+import { PolicyFromES } from '../../common/types';
 import { PolicyTable } from '../../public/application/sections/policy_table/policy_table';
 import { init as initHttp } from '../../public/application/services/http';
 import { init as initUiMetric } from '../../public/application/services/ui_metric';
-import { PolicyFromES } from '../../public/application/services/policies/types';
 
 initHttp(
   new HttpService().setup({

diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/extend_index_management.test.tsx
@@ -10,6 +10,7 @@ import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { usageCollectionPluginMock } from '../../../../src/plugins/usage_collection/public/mocks';
+import { Index } from '../common/types';
 import {
   retryLifecycleActionExtension,
   removeLifecyclePolicyActionExtension,
@@ -20,7 +21,6 @@ import {
 } from '../public/extend_index_management';
 import { init as initHttp } from '../public/application/services/http';
 import { init as initUiMetric } from '../public/application/services/ui_metric';
-import { Index } from '../public/application/services/policies/types';
 
 // We need to init the http with a mock for any tests that depend upon the http service.
 // For example, add_lifecycle_confirm_modal makes an API request in its componentDidMount

diff --git a/x-pack/plugins/index_lifecycle_management/common/types/index.ts b/x-pack/plugins/index_lifecycle_management/common/types/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './policies';
diff --git a/...ic/application/services/policies/types.ts → ...cycle_management/common/types/policies.ts b/...ic/application/services/policies/types.ts → ...cycle_management/common/types/policies.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Index as IndexInterface } from '../../../../../index_management/public';
+import { Index as IndexInterface } from '../../../index_management/common/types';
 
 export interface SerializedPolicy {
   name: string;
@@ -28,7 +28,7 @@ export interface PolicyFromES {
 }
 
 export interface SerializedPhase {
-  min_age: string;
+  min_age?: string;
   actions: {
     [action: string]: any;
   };
@@ -94,10 +94,10 @@ export interface SerializedDeletePhase extends SerializedPhase {
 }
 
 export interface AllocateAction {
-  number_of_replicas: number;
+  number_of_replicas?: number;
   include: {};
   exclude: {};
-  require: {
+  require?: {
     [attribute: string]: string;
   };
 }

diff --git a/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts b/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
@@ -11,7 +11,7 @@ import {
   HotPhase,
   WarmPhase,
   FrozenPhase,
-} from '../services/policies/types';
+} from '../../../common/types';
 
 export const defaultNewHotPhase: HotPhase = {
   phaseEnabled: true,

diff --git a/...lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx b/...lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx
@@ -12,7 +12,7 @@ import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect } from
 import { LearnMoreLink } from './learn_more_link';
 import { ErrableFormRow } from './form_errors';
 import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
-import { PhaseWithMinAge, Phases } from '../../../services/policies/types';
+import { PhaseWithMinAge, Phases } from '../../../../../common/types';
 
 function getTimingLabelForPhase(phase: keyof Phases) {
   // NOTE: Hot phase isn't necessary, because indices begin in the hot phase.