[ML] Rename DataFrameAnalyticsType -> DataFrameAnalysisConfigType

elastic · Sep 15, 2020 · d3edff7 · d3edff7
1 parent 29d8674
commit d3edff7
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 37 deletions.
diff --git a/x-pack/plugins/ml/common/types/data_frame_analytics.ts b/x-pack/plugins/ml/common/types/data_frame_analytics.ts
@@ -82,4 +82,4 @@ export interface DataFrameAnalyticsConfig {
  allow_lazy_start?: boolean;
 }
 
-export type DataFrameAnalyticsType = typeof ANALYSIS_CONFIG_TYPE[keyof typeof ANALYSIS_CONFIG_TYPE];
+export type DataFrameAnalysisConfigType = typeof ANALYSIS_CONFIG_TYPE[keyof typeof ANALYSIS_CONFIG_TYPE];
diff --git a/x-pack/plugins/ml/common/types/ml_url_generator.ts b/x-pack/plugins/ml/common/types/ml_url_generator.ts
@@ -7,7 +7,7 @@
 import { RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common/query';
 import { JobId } from './anomaly_detection_jobs/job';
 import { ML_PAGES } from '../constants/ml_url_generator';
-import { DataFrameAnalyticsType } from './data_frame_analytics';
+import { DataFrameAnalysisConfigType } from './data_frame_analytics';
 
 type OptionalPageState = object | undefined;
 
@@ -163,15 +163,15 @@ export type DataFrameAnalyticsUrlState = MLPageState<
 export interface DataFrameAnalyticsExplorationQueryState {
  ml: {
  jobId: JobId;
- analysisType: DataFrameAnalyticsType;
+ analysisType: DataFrameAnalysisConfigType;
  };
 }
 
 export type DataFrameAnalyticsExplorationUrlState = MLPageState<
  typeof ML_PAGES.DATA_FRAME_ANALYTICS_EXPLORATION,
  {
  jobId: JobId;
- analysisType: DataFrameAnalyticsType;
+ analysisType: DataFrameAnalysisConfigType;
  globalState?: MlCommonGlobalState;
  }
 >;

diff --git a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx
@@ -32,7 +32,7 @@ import { UseIndexDataReturnType } from './types';
 import { DecisionPathPopover } from './feature_importance/decision_path_popover';
 import { TopClasses } from '../../../../common/types/feature_importance';
 import { DEFAULT_RESULTS_FIELD } from '../../../../common/constants/data_frame_analytics';
-import { DataFrameAnalyticsType } from '../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../common/types/data_frame_analytics';
 
 // TODO Fix row hovering + bar highlighting
 // import { hoveredRow$ } from './column_chart';
@@ -45,7 +45,7 @@ export const DataGridTitle: FC<{ title: string }> = ({ title }) => (
 
 interface PropsWithoutHeader extends UseIndexDataReturnType {
  baseline?: number;
- analysisType?: DataFrameAnalyticsType;
+ analysisType?: DataFrameAnalysisConfigType;
  resultsField?: string;
  dataTestSubj: string;
  toastNotifications: CoreSetup['notifications']['toasts'];

diff --git a/...s/ml/public/application/components/data_grid/feature_importance/decision_path_popover.tsx b/...s/ml/public/application/components/data_grid/feature_importance/decision_path_popover.tsx
@@ -13,11 +13,11 @@ import { FeatureImportance, TopClasses } from '../../../../../common/types/featu
 import { ANALYSIS_CONFIG_TYPE } from '../../../data_frame_analytics/common';
 import { ClassificationDecisionPath } from './decision_path_classification';
 import { useMlKibana } from '../../../contexts/kibana';
-import { DataFrameAnalyticsType } from '../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../common/types/data_frame_analytics';
 
 interface DecisionPathPopoverProps {
  featureImportance: FeatureImportance[];
- analysisType: DataFrameAnalyticsType;
+ analysisType: DataFrameAnalysisConfigType;
  predictionFieldName?: string;
  baseline?: number;
  predictedValue?: number | string | undefined;

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
@@ -15,7 +15,7 @@ import { SavedSearchQuery } from '../../contexts/ml';
 import {
  AnalysisConfig,
  ClassificationAnalysis,
- DataFrameAnalyticsType,
+ DataFrameAnalysisConfigType,
  RegressionAnalysis,
 } from '../../../../common/types/data_frame_analytics';
 import {
@@ -430,7 +430,7 @@ interface LoadEvalDataConfig {
  predictionFieldName?: string;
  searchQuery?: ResultsSearchQuery;
  ignoreDefaultQuery?: boolean;
- jobType: DataFrameAnalyticsType;
+ jobType: DataFrameAnalysisConfigType;
  requiresKeyword?: boolean;
 }
 

diff --git a/...ytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx b/...ytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx
@@ -16,7 +16,7 @@ import { BASIC_NUMERICAL_TYPES, EXTENDED_NUMERICAL_TYPES } from '../../../../com
 import { CATEGORICAL_TYPES } from './form_options_validation';
 import { ES_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
 import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
-import { DataFrameAnalyticsType } from '../../../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 
 const containsClassificationFieldsCb = ({ name, type }: Field) =>
  !OMIT_FIELDS.includes(name) &&
@@ -33,13 +33,13 @@ const containsRegressionFieldsCb = ({ name, type }: Field) =>
 const containsOutlierFieldsCb = ({ name, type }: Field) =>
  !OMIT_FIELDS.includes(name) && name !== EVENT_RATE_FIELD_ID && BASIC_NUMERICAL_TYPES.has(type);
 
-const callbacks: Record<DataFrameAnalyticsType, (f: Field) => boolean> = {
+const callbacks: Record<DataFrameAnalysisConfigType, (f: Field) => boolean> = {
  [ANALYSIS_CONFIG_TYPE.CLASSIFICATION]: containsClassificationFieldsCb,
  [ANALYSIS_CONFIG_TYPE.REGRESSION]: containsRegressionFieldsCb,
  [ANALYSIS_CONFIG_TYPE.OUTLIER_DETECTION]: containsOutlierFieldsCb,
 };
 
-const messages: Record<DataFrameAnalyticsType, JSX.Element> = {
+const messages: Record<DataFrameAnalysisConfigType, JSX.Element> = {
  [ANALYSIS_CONFIG_TYPE.CLASSIFICATION]: (
  <FormattedMessage
  id="xpack.ml.dataframe.analytics.create.sourceObjectClassificationHelpText"

diff --git a/...e_analytics/pages/analytics_creation/components/create_step_footer/create_step_footer.tsx b/...e_analytics/pages/analytics_creation/components/create_step_footer/create_step_footer.tsx
@@ -18,13 +18,13 @@ import { ml } from '../../../../../services/ml_api_service';
 import { BackToListPanel } from '../back_to_list_panel';
 import { ViewResultsPanel } from '../view_results_panel';
 import { ProgressStats } from './progress_stats';
-import { DataFrameAnalyticsType } from '../../../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 
 export const PROGRESS_REFRESH_INTERVAL_MS = 1000;
 
 interface Props {
  jobId: string;
- jobType: DataFrameAnalyticsType;
+ jobType: DataFrameAnalysisConfigType;
  showProgress: boolean;
 }
 

diff --git a/...e_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx b/...e_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx
@@ -10,10 +10,10 @@ import { i18n } from '@kbn/i18n';
 import { useMlUrlGenerator } from '../../../../../contexts/kibana';
 import { ML_PAGES } from '../../../../../../../common/constants/ml_url_generator';
 import { useNavigateToPath } from '../../../../../contexts/kibana';
-import { DataFrameAnalyticsType } from '../../../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 interface Props {
  jobId: string;
- analysisType: DataFrameAnalyticsType;
+ analysisType: DataFrameAnalysisConfigType;
 }
 
 export const ViewResultsPanel: FC<Props> = ({ jobId, analysisType }) => {

diff --git a/.../analytics_exploration/components/exploration_results_table/exploration_results_table.tsx b/.../analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
@@ -38,7 +38,7 @@ import { IndexPatternPrompt } from '../index_pattern_prompt';
 
 import { useExplorationResults } from './use_exploration_results';
 import { useMlKibana } from '../../../../../contexts/kibana';
-import { DataFrameAnalyticsType } from '../../../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 
 const showingDocs = i18n.translate(
  'xpack.ml.dataframe.analytics.explorationResults.documentsShownHelpText',
@@ -195,7 +195,7 @@ export const ExplorationResultsTable: FC<Props> = React.memo(
  {...classificationData}
  dataTestSubj="mlExplorationDataGrid"
  toastNotifications={getToastNotifications()}
- analysisType={(analysisType as unknown) as DataFrameAnalyticsType}
+ analysisType={(analysisType as unknown) as DataFrameAnalysisConfigType}
  />
  </EuiFlexItem>
  </EuiFlexGroup>

diff --git a/...k/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx b/...k/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/page.tsx
@@ -27,11 +27,11 @@ import { RegressionExploration } from './components/regression_exploration';
 import { ClassificationExploration } from './components/classification_exploration';
 
 import { ANALYSIS_CONFIG_TYPE } from '../../../../../common/constants/data_frame_analytics';
-import { DataFrameAnalyticsType } from '../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../common/types/data_frame_analytics';
 
 export const Page: FC<{
  jobId: string;
- analysisType: DataFrameAnalyticsType;
+ analysisType: DataFrameAnalysisConfigType;
 }> = ({ jobId, analysisType }) => (
  <Fragment>
  <NavigationMenu tabId="data_frame_analytics" />

diff --git a/...ata_frame_analytics/pages/analytics_management/components/action_view/use_view_action.tsx b/...ata_frame_analytics/pages/analytics_management/components/action_view/use_view_action.tsx
@@ -13,15 +13,15 @@ import { DataFrameAnalyticsListAction, DataFrameAnalyticsListRow } from '../anal
 
 import { getViewLinkStatus } from './get_view_link_status';
 import { viewActionButtonText, ViewButton } from './view_button';
-import { DataFrameAnalyticsType } from '../../../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 import { ML_PAGES } from '../../../../../../../common/constants/ml_url_generator';
 
 export type ViewAction = ReturnType<typeof useViewAction>;
 export const useViewAction = () => {
  const mlUrlGenerator = useMlUrlGenerator();
  const navigateToPath = useNavigateToPath();
 
- const redirectToTab = async (jobId: string, analysisType: DataFrameAnalyticsType) => {
+ const redirectToTab = async (jobId: string, analysisType: DataFrameAnalysisConfigType) => {
  const path = await mlUrlGenerator.createUrl({
  page: ML_PAGES.DATA_FRAME_ANALYTICS_EXPLORATION,
  pageState: { jobId, analysisType },
@@ -31,7 +31,7 @@ export const useViewAction = () => {
  };
 
  const clickHandler = useCallback((item: DataFrameAnalyticsListRow) => {
- const analysisType = getAnalysisType(item.config.analysis) as DataFrameAnalyticsType;
+ const analysisType = getAnalysisType(item.config.analysis) as DataFrameAnalysisConfigType;
  redirectToTab(item.id, analysisType);
  }, []);
 

diff --git a/...ation/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts b/...ation/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
@@ -10,7 +10,7 @@ import { DATA_FRAME_TASK_STATE } from './data_frame_task_state';
 export { DATA_FRAME_TASK_STATE };
 
 import { DataFrameAnalyticsId, DataFrameAnalyticsConfig } from '../../../../common';
-import { DataFrameAnalyticsType } from '../../../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 
 export enum DATA_FRAME_MODE {
  BATCH = 'batch',
@@ -108,7 +108,7 @@ export interface DataFrameAnalyticsListRow {
  checkpointing: object;
  config: DataFrameAnalyticsConfig;
  id: DataFrameAnalyticsId;
- job_type: DataFrameAnalyticsType;
+ job_type: DataFrameAnalysisConfigType;
  mode: string;
  state: DataFrameAnalyticsStats['state'];
  stats: DataFrameAnalyticsStats;

diff --git a/...a_frame_analytics/pages/analytics_management/components/models_management/models_list.tsx b/...a_frame_analytics/pages/analytics_management/components/models_management/models_list.tsx
@@ -44,7 +44,7 @@ import {
 import { useTableSettings } from '../analytics_list/use_table_settings';
 import { filterAnalyticsModels, AnalyticsSearchBar } from '../analytics_search_bar';
 import { ML_PAGES } from '../../../../../../../common/constants/ml_url_generator';
-import { DataFrameAnalyticsType } from '../../../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 
 type Stats = Omit<TrainedModelStat, 'model_id'>;
 
@@ -288,7 +288,7 @@ export const ModelsList: FC = () => {
  jobId: item.metadata?.analytics_config.id as string,
  analysisType: Object.keys(
  item.metadata?.analytics_config.analysis
- )[0] as DataFrameAnalyticsType,
+ )[0] as DataFrameAnalysisConfigType,
  },
  });
 

diff --git a/.../data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts b/.../data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
@@ -13,7 +13,7 @@ import { CloneDataFrameAnalyticsConfig } from '../../components/action_clone';
 import {
  DataFrameAnalyticsConfig,
  DataFrameAnalyticsId,
- DataFrameAnalyticsType,
+ DataFrameAnalysisConfigType,
 } from '../../../../../../../common/types/data_frame_analytics';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../../../../common/constants/data_frame_analytics';
 export enum DEFAULT_MODEL_MEMORY_LIMIT {
@@ -29,7 +29,7 @@ export const UNSET_CONFIG_ITEM = '--';
 export type EsIndexName = string;
 export type DependentVariable = string;
 export type IndexPatternTitle = string;
-export type AnalyticsJobType = DataFrameAnalyticsType | undefined;
+export type AnalyticsJobType = DataFrameAnalysisConfigType | undefined;
 type IndexPatternId = string;
 export type SourceIndexMap = Record<
  IndexPatternTitle,
@@ -291,7 +291,7 @@ export function getFormStateFromJobConfig(
  analyticsJobConfig: Readonly<CloneDataFrameAnalyticsConfig>,
  isClone: boolean = true
 ): Partial<State['form']> {
- const jobType = Object.keys(analyticsJobConfig.analysis)[0] as DataFrameAnalyticsType;
+ const jobType = Object.keys(analyticsJobConfig.analysis)[0] as DataFrameAnalysisConfigType;
 
  const resultState: Partial<State['form']> = {
  jobType,

diff --git a/...ta_frame_analytics/pages/analytics_management/services/analytics_service/get_analytics.ts b/...ta_frame_analytics/pages/analytics_management/services/analytics_service/get_analytics.ts
@@ -21,7 +21,7 @@ import {
  isDataFrameAnalyticsStopped,
 } from '../../components/analytics_list/common';
 import { AnalyticStatsBarStats } from '../../../../../components/stats_bar';
-import { DataFrameAnalyticsType } from '../../../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../../../common/types/data_frame_analytics';
 
 export const isGetDataFrameAnalyticsStatsResponseOk = (
  arg: any
@@ -140,7 +140,7 @@ export const getAnalyticsFactory = (
  checkpointing: {},
  config,
  id: config.id,
- job_type: Object.keys(config.analysis)[0] as DataFrameAnalyticsType,
+ job_type: Object.keys(config.analysis)[0] as DataFrameAnalysisConfigType,
  mode: DATA_FRAME_MODE.BATCH,
  state: stats.state,
  stats,

diff --git a/x-pack/plugins/ml/public/application/overview/components/analytics_panel/actions.tsx b/x-pack/plugins/ml/public/application/overview/components/analytics_panel/actions.tsx
@@ -14,7 +14,7 @@ import { getAnalysisType } from '../../../data_frame_analytics/common/analytics'
 import { DataFrameAnalyticsListRow } from '../../../data_frame_analytics/pages/analytics_management/components/analytics_list/common';
 import { getViewLinkStatus } from '../../../data_frame_analytics/pages/analytics_management/components/action_view/get_view_link_status';
 import { ML_PAGES } from '../../../../../common/constants/ml_url_generator';
-import { DataFrameAnalyticsType } from '../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../common/types/data_frame_analytics';
 
 interface Props {
  item: DataFrameAnalyticsListRow;
@@ -37,7 +37,7 @@ export const ViewLink: FC<Props> = ({ item }) => {
  page: ML_PAGES.DATA_FRAME_ANALYTICS_EXPLORATION,
  pageState: {
  jobId: item.id,
- analysisType: analysisType as DataFrameAnalyticsType,
+ analysisType: analysisType as DataFrameAnalysisConfigType,
  },
  excludeBasePath: true,
  });

diff --git a/...s/ml/public/application/routing/routes/data_frame_analytics/analytics_job_exploration.tsx b/...s/ml/public/application/routing/routes/data_frame_analytics/analytics_job_exploration.tsx
@@ -18,7 +18,7 @@ import { basicResolvers } from '../../resolvers';
 import { Page } from '../../../data_frame_analytics/pages/analytics_exploration';
 import { getBreadcrumbWithUrlForApp } from '../../breadcrumbs';
 import { ML_PAGES } from '../../../../../common/constants/ml_url_generator';
-import { DataFrameAnalyticsType } from '../../../../../common/types/data_frame_analytics';
+import { DataFrameAnalysisConfigType } from '../../../../../common/types/data_frame_analytics';
 
 export const analyticsJobExplorationRouteFactory = (
  navigateToPath: NavigateToPath,
@@ -66,7 +66,7 @@ const PageWrapper: FC<PageProps> = ({ location, deps }) => {
  return <></>;
  }
  const jobId: string = globalState.ml.jobId;
- const analysisType: DataFrameAnalyticsType = globalState.ml.analysisType;
+ const analysisType: DataFrameAnalysisConfigType = globalState.ml.analysisType;
 
  return (
  <PageLoader context={context}>