github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-25 02:09:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] [Job wizards] switching to new kibana context provider (#42512)

Browse source
This commit is contained in:
James Gowdy 2019-08-02 11:48:43 +01:00 • committed by GitHub
parent 658ee17262
commit a42c12d3dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
x-pack/legacy/plugins/ml/public/contexts/kibana/index.ts
View file

@ -4,7 +4,12 @@
* you may not use this file except in compliance with the Elastic License. * you may not use this file except in compliance with the Elastic License.
*/ */
export { KibanaContext, KibanaContextValue, SavedSearchQuery } from './kibana_context'; export {
KibanaContext,
KibanaContextValue,
SavedSearchQuery,
KibanaConfigTypeFix,
} from './kibana_context';
export { useKibanaContext } from './use_kibana_context'; export { useKibanaContext } from './use_kibana_context';
export { useCurrentIndexPattern } from './use_current_index_pattern'; export { useCurrentIndexPattern } from './use_current_index_pattern';
export { useCurrentSavedSearch } from './use_current_saved_search'; export { useCurrentSavedSearch } from './use_current_saved_search';

4
x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/directive.tsx
View file

@ -27,7 +27,7 @@ type CreateSearchItems = () => {
combinedQuery: any; combinedQuery: any;
}; };
import { KibanaConfigTypeFix, KibanaContext } from '../../../contexts/kibana/kibana_context'; import { KibanaConfigTypeFix, KibanaContext } from '../../../contexts/kibana';
import { Page } from './page'; import { Page } from './page';
module.directive('mlNewDataFrame', ($injector: InjectorService) => { module.directive('mlNewDataFrame', ($injector: InjectorService) => {
@ -38,7 +38,7 @@ module.directive('mlNewDataFrame', ($injector: InjectorService) => {
const indexPatterns = $injector.get<IndexPatterns>('indexPatterns'); const indexPatterns = $injector.get<IndexPatterns>('indexPatterns');
const kbnBaseUrl = $injector.get<string>('kbnBaseUrl'); const kbnBaseUrl = $injector.get<string>('kbnBaseUrl');
const kibanaConfig = $injector.get<KibanaConfigTypeFix>('config'); const kibanaConfig = $injector.get<KibanaConfigTypeFix>('config');
const Private: IPrivate = $injector.get('Private'); const Private = $injector.get<IPrivate>('Private');
timefilter.disableTimeRangeSelector(); timefilter.disableTimeRangeSelector();
timefilter.disableAutoRefreshSelector(); timefilter.disableAutoRefreshSelector();

7
x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range.tsx
View file

@ -12,7 +12,7 @@ import moment from 'moment';
import { WizardNav } from '../wizard_nav'; import { WizardNav } from '../wizard_nav';
import { WIZARD_STEPS, StepProps } from '../step_types'; import { WIZARD_STEPS, StepProps } from '../step_types';
import { JobCreatorContext } from '../job_creator_context'; import { JobCreatorContext } from '../job_creator_context';
import { KibanaContext, isKibanaContext } from '../../../../../data_frame/common/kibana_context'; import { useKibanaContext } from '../../../../../contexts/kibana';
import { FullTimeRangeSelector } from '../../../../../components/full_time_range_selector'; import { FullTimeRangeSelector } from '../../../../../components/full_time_range_selector';
import { EventRateChart } from '../charts/event_rate_chart'; import { EventRateChart } from '../charts/event_rate_chart';
import { LineChartPoint } from '../../../common/chart_loader'; import { LineChartPoint } from '../../../common/chart_loader';
@ -26,10 +26,7 @@ export interface TimeRange {
end: number; end: number;
} }
export const TimeRangeStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep }) => { export const TimeRangeStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep }) => {
const kibanaContext = useContext(KibanaContext); const kibanaContext = useKibanaContext();
if (!isKibanaContext(kibanaContext)) {
return null;
}
const { const {
jobCreator, jobCreator,

11
x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range_picker.tsx
View file

@ -5,10 +5,10 @@
*/ */
import moment from 'moment'; import moment from 'moment';
import React, { Fragment, FC, useContext, useState, useEffect } from 'react'; import React, { Fragment, FC, useState, useEffect } from 'react';
import { EuiDatePickerRange, EuiDatePicker } from '@elastic/eui'; import { EuiDatePickerRange, EuiDatePicker } from '@elastic/eui';
import { KibanaContext, isKibanaContext } from '../../../../../data_frame/common/kibana_context'; import { useKibanaContext } from '../../../../../contexts/kibana';
import { TimeRange } from './time_range'; import { TimeRange } from './time_range';
const WIDTH = '512px'; const WIDTH = '512px';
@ -21,11 +21,8 @@ interface Props {
type Moment = moment.Moment; type Moment = moment.Moment;
export const TimeRangePicker: FC<Props> = ({ setTimeRange, timeRange }) => { export const TimeRangePicker: FC<Props> = ({ setTimeRange, timeRange }) => {
const kibanaContext = useContext(KibanaContext); const kibanaContext = useKibanaContext();
if (!isKibanaContext(kibanaContext)) { const dateFormat: string = kibanaContext.kibanaConfig.get('dateFormat');
return null;
}
const dateFormat = kibanaContext.kibanaConfig.get('dateFormat');
const [startMoment, setStartMoment] = useState<Moment | undefined>(moment(timeRange.start)); const [startMoment, setStartMoment] = useState<Moment | undefined>(moment(timeRange.start));
const [endMoment, setEndMoment] = useState<Moment | undefined>(moment(timeRange.end)); const [endMoment, setEndMoment] = useState<Moment | undefined>(moment(timeRange.end));

9
x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/directive.tsx
View file

@ -11,6 +11,7 @@ import ReactDOM from 'react-dom';
import { uiModules } from 'ui/modules'; import { uiModules } from 'ui/modules';
const module = uiModules.get('apps/ml', ['react']); const module = uiModules.get('apps/ml', ['react']);
import { timefilter } from 'ui/timefilter'; import { timefilter } from 'ui/timefilter';
import { IndexPatterns } from 'ui/index_patterns';
import { I18nContext } from 'ui/i18n'; import { I18nContext } from 'ui/i18n';
import { IPrivate } from 'ui/private'; import { IPrivate } from 'ui/private';
@ -20,7 +21,7 @@ import { SearchItemsProvider } from '../../../new_job/utils/new_job_utils';
import { Page, PageProps } from './page'; import { Page, PageProps } from './page';
import { JOB_TYPE } from '../../common/job_creator/util/constants'; import { JOB_TYPE } from '../../common/job_creator/util/constants';
import { KibanaContext } from '../../../../data_frame/common/kibana_context'; import { KibanaContext, KibanaConfigTypeFix } from '../../../../contexts/kibana';
module.directive('mlNewJobPage', ($injector: InjectorService) => { module.directive('mlNewJobPage', ($injector: InjectorService) => {
return { return {
@ -30,10 +31,10 @@ module.directive('mlNewJobPage', ($injector: InjectorService) => {
timefilter.disableTimeRangeSelector(); timefilter.disableTimeRangeSelector();
timefilter.disableAutoRefreshSelector(); timefilter.disableAutoRefreshSelector();
const indexPatterns = $injector.get('indexPatterns'); const indexPatterns = $injector.get<IndexPatterns>('indexPatterns');
const kbnBaseUrl = $injector.get<string>('kbnBaseUrl'); const kbnBaseUrl = $injector.get<string>('kbnBaseUrl');
const kibanaConfig = $injector.get('config'); const kibanaConfig = $injector.get<KibanaConfigTypeFix>('config');
const Private: IPrivate = $injector.get('Private'); const Private = $injector.get<IPrivate>('Private');
const $route = $injector.get<any>('$route'); const $route = $injector.get<any>('$route');
const existingJobsAndGroups = $route.current.locals.existingJobsAndGroups; const existingJobsAndGroups = $route.current.locals.existingJobsAndGroups;

9
x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
View file

@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License. * you may not use this file except in compliance with the Elastic License.
*/ */
import React, { FC, useContext, useEffect, Fragment } from 'react'; import React, { FC, useEffect, Fragment } from 'react';
import { EuiPage, EuiPageBody, EuiPageContentBody } from '@elastic/eui'; import { EuiPage, EuiPageBody, EuiPageContentBody } from '@elastic/eui';
import { Wizard } from './wizard'; import { Wizard } from './wizard';
@ -21,7 +21,7 @@ import {
import { ChartLoader } from '../../common/chart_loader'; import { ChartLoader } from '../../common/chart_loader';
import { ResultsLoader } from '../../common/results_loader'; import { ResultsLoader } from '../../common/results_loader';
import { JobValidator } from '../../common/job_validator'; import { JobValidator } from '../../common/job_validator';
import { KibanaContext, isKibanaContext } from '../../../../data_frame/common/kibana_context'; import { useKibanaContext } from '../../../../contexts/kibana';
import { getTimeFilterRange } from '../../../../components/full_time_range_selector'; import { getTimeFilterRange } from '../../../../components/full_time_range_selector';
import { MlTimeBuckets } from '../../../../util/ml_time_buckets'; import { MlTimeBuckets } from '../../../../util/ml_time_buckets';
import { newJobDefaults } from '../../../new_job/utils/new_job_defaults'; import { newJobDefaults } from '../../../new_job/utils/new_job_defaults';
@ -38,10 +38,7 @@ export interface PageProps {
} }
export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => { export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
const kibanaContext = useContext(KibanaContext); const kibanaContext = useKibanaContext();
if (!isKibanaContext(kibanaContext)) {
return null;
}
const jobDefaults = newJobDefaults(); const jobDefaults = newJobDefaults();