renaming all ml server info getter functions

elastic · Nov 12, 2019 · 4d404d7 · 4d404d7
1 parent afcc4f8
commit 4d404d7
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 27 deletions.
diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/edit_job_flyout/edit_utils.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/edit_job_flyout/edit_utils.js
@@ -7,7 +7,7 @@
 
 import { difference } from 'lodash';
 import chrome from 'ui/chrome';
-import { newJobLimits } from '../../../../services/ml_server_info';
+import { getNewJobLimits } from '../../../../services/ml_server_info';
 import { mlJobService } from 'plugins/ml/services/job_service';
 import { processCreatedBy } from '../../../../../common/util/job_utils';
 
@@ -157,7 +157,7 @@ function extractGroups(job, newJobData) {
 }
 
 function extractMML(job, newJobData) {
-  const jobLimits = newJobLimits();
+  const jobLimits = getNewJobLimits();
   const mmlData = {};
   // if the job's model_memory_limit has changed, add it to the jobData json
   if (job.analysis_limits.model_memory_limit !== undefined) {

diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/edit_job_flyout/tabs/datafeed.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/edit_job_flyout/tabs/datafeed.js
@@ -19,7 +19,7 @@ import {
 } from '@elastic/eui';
 
 import { calculateDatafeedFrequencyDefaultSeconds } from 'plugins/ml/../common/util/job_utils';
-import { newJobDefaults } from '../../../../../services/ml_server_info';
+import { getNewJobDefaults } from '../../../../../services/ml_server_info';
 import { parseInterval } from 'plugins/ml/../common/util/parse_interval';
 import { MLJobEditor } from '../../ml_job_editor';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -47,7 +47,7 @@ export class Datafeed extends Component {
         frequency: '',
         scrollSize: 0,
       },
-      jobDefaults: newJobDefaults()
+      jobDefaults: getNewJobDefaults()
     };
 
     this.setDatafeed = props.setDatafeed;

diff --git a/...ins/ml/public/jobs/jobs_list/components/node_available_warning/node_available_warning.tsx b/...ins/ml/public/jobs/jobs_list/components/node_available_warning/node_available_warning.tsx
@@ -9,14 +9,14 @@ import React, { Fragment, FC } from 'react';
 import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { mlNodesAvailable, permissionToViewMlNodeCount } from '../../../../ml_nodes_check';
-import { cloudDeploymentId, isCloud } from '../../../../services/ml_server_info';
+import { getCloudDeploymentId, isCloud } from '../../../../services/ml_server_info';
 
 export const NodeAvailableWarning: FC = () => {
   if (mlNodesAvailable() === true || permissionToViewMlNodeCount() === false) {
     return null;
   }
 
-  const id = cloudDeploymentId();
+  const id = getCloudDeploymentId();
   return (
     <Fragment>
       <EuiCallOut

diff --git a/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/validate_job.js b/x-pack/legacy/plugins/ml/public/jobs/jobs_list/components/validate_job.js
@@ -5,7 +5,7 @@
  */
 
 
-import { newJobLimits } from '../../../services/ml_server_info';
+import { getNewJobLimits } from '../../../services/ml_server_info';
 import { populateValidationMessages } from '../../new_job_new/common/job_validator/util';
 
 import {
@@ -16,7 +16,7 @@ import {
 import { isValidLabel, isValidTimeRange } from '../../../util/custom_url_utils';
 
 export function validateModelMemoryLimit(mml) {
-  const limits = newJobLimits();
+  const limits = getNewJobLimits();
   const tempJob = {
     analysis_limits: {
       model_memory_limit: mml

diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_validator/job_validator.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_validator/job_validator.ts
@@ -6,7 +6,7 @@
 
 import { ReactElement } from 'react';
 import { basicJobValidation, basicDatafeedValidation } from '../../../../../common/util/job_utils';
-import { newJobLimits } from '../../../../services/ml_server_info';
+import { getNewJobLimits } from '../../../../services/ml_server_info';
 import { JobCreatorType } from '../job_creator';
 import { populateValidationMessages, checkForExistingJobAndGroupIds } from './util';
 import { ExistingJobsAndGroups } from '../../../../services/job_service';
@@ -111,7 +111,7 @@ export class JobValidator {
 
     const jobConfig = this._jobCreator.jobConfig;
     const datafeedConfig = this._jobCreator.datafeedConfig;
-    const limits = newJobLimits();
+    const limits = getNewJobLimits();
 
     // run standard basic validation
     const basicJobResults = basicJobValidation(jobConfig, undefined, limits);

diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_validator/util.ts b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_validator/util.ts
@@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n';
 import { BasicValidations } from './job_validator';
 import { Job, Datafeed } from '../job_creator/configs';
 import { ALLOWED_DATA_UNITS, JOB_ID_MAX_LENGTH } from '../../../../../common/constants/validation';
-import { newJobLimits } from '../../../../services/ml_server_info';
+import { getNewJobLimits } from '../../../../services/ml_server_info';
 import { ValidationResults, ValidationMessage } from '../../../../../common/util/job_utils';
 import { ExistingJobsAndGroups } from '../../../../services/job_service';
 
@@ -18,7 +18,7 @@ export function populateValidationMessages(
   jobConfig: Job,
   datafeedConfig: Datafeed
 ) {
-  const limits = newJobLimits();
+  const limits = getNewJobLimits();
 
   if (validationResults.contains('job_id_empty')) {
     basicValidations.jobId.valid = false;

diff --git a/.../jobs/new_job_new/pages/components/common/model_memory_limit/model_memory_limit_input.tsx b/.../jobs/new_job_new/pages/components/common/model_memory_limit/model_memory_limit_input.tsx
@@ -6,7 +6,7 @@
 
 import React, { FC, useState, useContext, useEffect } from 'react';
 import { EuiFieldText } from '@elastic/eui';
-import { newJobDefaults } from '../../../../../../services/ml_server_info';
+import { getNewJobDefaults } from '../../../../../../services/ml_server_info';
 import { JobCreatorContext } from '../../job_creator_context';
 import { Description } from './description';
 
@@ -23,7 +23,7 @@ export const ModelMemoryLimitInput: FC = () => {
     jobCreator.modelMemoryLimit === null ? '' : jobCreator.modelMemoryLimit
   );
 
-  const { anomaly_detectors: anomalyDetectors } = newJobDefaults();
+  const { anomaly_detectors: anomalyDetectors } = getNewJobDefaults();
   const { model_memory_limit: modelMemoryLimitDefault } = anomalyDetectors;
 
   useEffect(() => {

diff --git a/...s/new_job_new/pages/components/datafeed_step/components/scroll_size/scroll_size_input.tsx b/...s/new_job_new/pages/components/datafeed_step/components/scroll_size/scroll_size_input.tsx
@@ -6,7 +6,7 @@
 
 import React, { FC, useState, useContext, useEffect } from 'react';
 import { EuiFieldNumber } from '@elastic/eui';
-import { newJobDefaults } from '../../../../../../../services/ml_server_info';
+import { getNewJobDefaults } from '../../../../../../../services/ml_server_info';
 import { JobCreatorContext } from '../../../job_creator_context';
 import { Description } from './description';
 
@@ -19,7 +19,7 @@ export const ScrollSizeInput: FC = () => {
     jobCreator.scrollSize === null ? '' : `${jobCreator.scrollSize}`
   );
 
-  const { datafeeds } = newJobDefaults();
+  const { datafeeds } = getNewJobDefaults();
   const scrollSizeDefault = datafeeds.scroll_size !== undefined ? `${datafeeds.scroll_size}` : '';
 
   useEffect(() => {

diff --git a/...ew_job_new/pages/components/summary_step/components/datafeed_details/datafeed_details.tsx b/...ew_job_new/pages/components/summary_step/components/datafeed_details/datafeed_details.tsx
@@ -11,14 +11,14 @@ import { JobCreatorContext } from '../../../job_creator_context';
 import { MLJobEditor } from '../../../../../../jobs_list/components/ml_job_editor';
 import { calculateDatafeedFrequencyDefaultSeconds } from '../../../../../../../../common/util/job_utils';
 import { DEFAULT_QUERY_DELAY } from '../../../../../common/job_creator/util/constants';
-import { newJobDefaults } from '../../../../../../../services/ml_server_info';
+import { getNewJobDefaults } from '../../../../../../../services/ml_server_info';
 import { ListItems, defaultLabel, Italic } from '../common';
 
 const EDITOR_HEIGHT = '200px';
 
 export const DatafeedDetails: FC = () => {
   const { jobCreator } = useContext(JobCreatorContext);
-  const { datafeeds } = newJobDefaults();
+  const { datafeeds } = getNewJobDefaults();
 
   const queryString = JSON.stringify(jobCreator.query, null, 2);
   const defaultFrequency = calculateDatafeedFrequencyDefaultSeconds(jobCreator.bucketSpanMs / 1000);

diff --git a/...lic/jobs/new_job_new/pages/components/summary_step/components/job_details/job_details.tsx b/...lic/jobs/new_job_new/pages/components/summary_step/components/job_details/job_details.tsx
@@ -15,15 +15,15 @@ import {
   isPopulationJobCreator,
   isAdvancedJobCreator,
 } from '../../../../../common/job_creator';
-import { newJobDefaults } from '../../../../../../../services/ml_server_info';
+import { getNewJobDefaults } from '../../../../../../../services/ml_server_info';
 import { ListItems, falseLabel, trueLabel, defaultLabel, Italic } from '../common';
 import { useKibanaContext } from '../../../../../../../contexts/kibana';
 
 export const JobDetails: FC = () => {
   const { jobCreator } = useContext(JobCreatorContext);
   const kibanaContext = useKibanaContext();
   const dateFormat: string = kibanaContext.kibanaConfig.get('dateFormat');
-  const { anomaly_detectors: anomalyDetectors } = newJobDefaults();
+  const { anomaly_detectors: anomalyDetectors } = getNewJobDefaults();
 
   const isAdvanced = isAdvancedJobCreator(jobCreator);
 

diff --git a/x-pack/legacy/plugins/ml/public/services/ml_server_info.test.ts b/x-pack/legacy/plugins/ml/public/services/ml_server_info.test.ts
@@ -6,10 +6,10 @@
 
 import {
   loadMlServerInfo,
-  cloudDeploymentId,
+  getCloudDeploymentId,
   isCloud,
-  newJobDefaults,
-  newJobLimits,
+  getNewJobDefaults,
+  getNewJobLimits,
 } from './ml_server_info';
 import mockMlInfoResponse from './__mocks__/ml_info_response.json';
 
@@ -22,7 +22,7 @@ jest.mock('./ml_api_service', () => ({
 describe('ml_server_info initial state', () => {
   it('server info not loaded ', () => {
     expect(isCloud()).toBe(false);
-    expect(cloudDeploymentId()).toBe(null);
+    expect(getCloudDeploymentId()).toBe(null);
   });
 });
 
@@ -35,13 +35,13 @@ describe('ml_server_info', () => {
   describe('cloud information', () => {
     it('can get could deployment id', () => {
       expect(isCloud()).toBe(true);
-      expect(cloudDeploymentId()).toBe('85d666f3350c469e8c3242d76a7f459c');
+      expect(getCloudDeploymentId()).toBe('85d666f3350c469e8c3242d76a7f459c');
     });
   });
 
   describe('defaults', () => {
     it('can get defaults', async done => {
-      const defaults = newJobDefaults();
+      const defaults = getNewJobDefaults();
 
       expect(defaults.anomaly_detectors.model_memory_limit).toBe('128mb');
       expect(defaults.anomaly_detectors.categorization_examples_limit).toBe(4);
@@ -53,7 +53,7 @@ describe('ml_server_info', () => {
 
   describe('limits', () => {
     it('can get limits', async done => {
-      const limits = newJobLimits();
+      const limits = getNewJobLimits();
 
       expect(limits.max_model_memory_limit).toBe('128mb');
       done();