changes based on review

elastic · Feb 11, 2020 · 8464f2a · 8464f2a
1 parent eed8c87
commit 8464f2a
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 82 deletions.
diff --git a/.../legacy/plugins/ml/public/application/components/navigation_menu/top_nav/top_nav.test.tsx b/.../legacy/plugins/ml/public/application/components/navigation_menu/top_nav/top_nav.test.tsx
@@ -62,8 +62,6 @@ describe('Navigation Menu: <TopNav />', () => {
       </MemoryRouter>
     );
     expect(wrapper.find(TopNav)).toHaveLength(1);
-    // disabled broken test
-    // expect(wrapper.find('EuiSuperDatePicker')).toHaveLength(1);
     expect(refreshListener).toBeCalledTimes(0);
 
     refreshSubscription.unsubscribe();

diff --git a/x-pack/legacy/plugins/ml/public/application/overview/components/sidebar.tsx b/x-pack/legacy/plugins/ml/public/application/overview/components/sidebar.tsx
@@ -11,7 +11,6 @@ import { useMlKibana } from '../../contexts/kibana';
 
 const createJobLink = '#/jobs/new_job/step/index_or_search';
 const feedbackLink = 'https://www.elastic.co/community/';
-const transformsLink = '/app/kibana#/management/elasticsearch/transform';
 const whatIsMachineLearningLink = 'https://www.elastic.co/what-is/elasticsearch-machine-learning';
 
 interface Props {
@@ -44,6 +43,7 @@ export const OverviewSideBar: FC<Props> = ({ createAnomalyDetectionJobDisabled }
 
   const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = docLinks;
   const docsLink = `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/xpack-ml.html`;
+  const transformsLink = `${basePath.get()}/app/kibana#/management/elasticsearch/transform`;
 
   return (
     <EuiFlexItem grow={1}>
@@ -72,7 +72,7 @@ export const OverviewSideBar: FC<Props> = ({ createAnomalyDetectionJobDisabled }
               ),
               createJob: getCreateJobLink(createAnomalyDetectionJobDisabled),
               transforms: (
-                <EuiLink href={`${basePath.get()}${transformsLink}`} target="blank">
+                <EuiLink href={transformsLink} target="blank">
                   <FormattedMessage
                     id="xpack.ml.overview.gettingStartedSectionTransforms"
                     defaultMessage="Elasticsearch's transforms"

diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/annotations.ts b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/annotations.ts
@@ -6,11 +6,7 @@
 
 import { Annotation } from '../../../../common/types/annotations';
 import { http, http$ } from '../http_service';
-import { getBasePath } from '../../util/dependency_cache';
-
-function basePath() {
-  return getBasePath().prepend('/api/ml');
-}
+import { basePath } from './index';
 
 export const annotations = {
   getAnnotations(obj: {

diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js
@@ -6,11 +6,7 @@
 
 import { http } from '../http_service';
 
-import { getBasePath } from '../../util/dependency_cache';
-
-function basePath() {
-  return getBasePath().prepend('/api/ml');
-}
+import { basePath } from './index';
 
 export const dataFrameAnalytics = {
   getDataFrameAnalytics(analyticsId) {

diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/datavisualizer.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/datavisualizer.js
@@ -6,11 +6,7 @@
 
 import { http } from '../http_service';
 
-import { getBasePath } from '../../util/dependency_cache';
-
-function basePath() {
-  return getBasePath().prepend('/api/ml');
-}
+import { basePath } from './index';
 
 export const fileDatavisualizer = {
   analyzeFile(obj, params = {}) {

diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/filters.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/filters.js
@@ -9,11 +9,7 @@
 
 import { http } from '../http_service';
 
-import { getBasePath } from '../../util/dependency_cache';
-
-function basePath() {
-  return getBasePath().prepend('/api/ml');
-}
+import { basePath } from './index';
 
 export const filters = {
   filters(obj) {

diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts
@@ -29,6 +29,8 @@ import {
 } from '../../../../common/types/categories';
 import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '../../../../common/constants/new_job';
 
+declare const basePath: () => string;
+
 // TODO This is not a complete representation of all methods of `ml.*`.
 // It just satisfies needs for other parts of the code area which use
 // TypeScript and rely on the methods typed in here.

diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.js
@@ -15,7 +15,7 @@ import { jobs } from './jobs';
 import { fileDatavisualizer } from './datavisualizer';
 import { getBasePath } from '../../util/dependency_cache';
 
-function basePath() {
+export function basePath() {
   return getBasePath().prepend('/api/ml');
 }
 

diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/jobs.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/jobs.js
@@ -6,11 +6,7 @@
 
 import { http } from '../http_service';
 
-import { getBasePath } from '../../util/dependency_cache';
-
-function basePath() {
-  return getBasePath().prepend('/api/ml');
-}
+import { basePath } from './index';
 
 export const jobs = {
   jobsSummary(jobIds) {

diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js
@@ -8,11 +8,7 @@
 
 import { http, http$ } from '../http_service';
 
-import { getBasePath } from '../../util/dependency_cache';
-
-function basePath() {
-  return getBasePath().prepend('/api/ml');
-}
+import { basePath } from './index';
 
 export const results = {
   getAnomaliesTableData(

diff --git a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/calendars_list.test.js
@@ -5,11 +5,8 @@
  */
 
 import React from 'react';
-// import { I18nProvider } from '@kbn/i18n/react';
-// import { mount, shallow } from 'enzyme';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { ml } from '../../../services/ml_api_service';
-// import { KibanaContextProvider } from '../../../../../../../../../src/plugins/kibana_react/public';
 
 import { CalendarsList } from './calendars_list';
 
@@ -115,28 +112,6 @@ const props = {
   },
 };
 
-// const services = {
-//   data: {
-//     query: {
-//       timefilter: {
-//         timefilter: {
-//           disableTimeRangeSelector: jest.fn(),
-//           disableAutoRefreshSelector: jest.fn(),
-//         },
-//       },
-//     },
-//   },
-//   notifications: {
-//     toasts: {
-//       addDanger: () => {},
-//     },
-//   },
-//   docLinks: {
-//     ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
-//     DOC_LINK_VERSION: 'jest-metadata-mock-branch',
-//   },
-// };
-
 describe('CalendarsList', () => {
   test('loads calendars on mount', () => {
     ml.calendars = jest.fn(() => []);
@@ -151,25 +126,4 @@ describe('CalendarsList', () => {
     wrapper.update();
     expect(wrapper).toMatchSnapshot();
   });
-
-  // disabled broken tests
-
-  // test('Sets selected calendars list on checkbox change', () => {
-  //   const wrapper = mount(
-  //     <I18nProvider>
-  //       <KibanaContextProvider services={services}>
-  //         <CalendarsList {...props} />
-  //       </KibanaContextProvider>
-  //     </I18nProvider>
-  //   );
-
-  //   const instance = wrapper.instance();
-  //   const spy = jest.spyOn(instance, 'setSelectedCalendarList');
-  //   instance.setState(testingState);
-  //   wrapper.update();
-
-  //   const checkbox = wrapper.find('input[type="checkbox"]').first();
-  //   checkbox.simulate('change');
-  //   expect(spy).toHaveBeenCalled();
-  // });
 });
diff --git a/x-pack/legacy/plugins/ml/public/application/util/time_buckets.js b/x-pack/legacy/plugins/ml/public/application/util/time_buckets.js
@@ -314,7 +314,6 @@ TimeBuckets.prototype.getScaledDateFormat = function() {
 TimeBuckets.prototype.getScaledDateFormatter = function() {
   const fieldFormats = getFieldFormats();
   const uiSettings = getUiSettings();
-  // const getConfig = (...args) => uiSettings.get(...args);
   const DateFieldFormat = fieldFormats.getType(FIELD_FORMAT_IDS.DATE);
   return new DateFieldFormat(
     {