github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Fix start datafeed start time selection (#21203)

Browse source 
* [ML] Fix start datafeed start time selection

* disabling start button if start and end are the same

* adding comment
This commit is contained in:
James Gowdy 2018-07-25 20:24:18 +01:00 • committed by GitHub
parent f82b9717c0
commit f87ef518b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
x-pack/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/start_datafeed_modal.js
View file

@ -34,17 +34,19 @@ export class StartDatafeedModal extends Component {
constructor(props) {
super(props);
const now = moment();
this.state = {
jobs: this.props.jobs,
isModalVisible: false,
startTime: moment(),
endTime: moment(),
startTime: now,
endTime: now,
createWatch: false,
allowCreateWatch: false,
initialSpecifiedStartTime: moment()
initialSpecifiedStartTime: now,
now,
};
this.initialSpecifiedStartTime = moment();
this.initialSpecifiedStartTime = now;
this.refreshJobs = this.props.refreshJobs;
this.getShowCreateWatchFlyoutFunction = this.props.getShowCreateWatchFlyoutFunction;
}
@ -79,7 +81,8 @@ export class StartDatafeedModal extends Component {
showModal = (jobs, showCreateWatchFlyout) => {
const startTime = undefined;
const endTime = moment();
const now = moment();
const endTime = now;
const initialSpecifiedStartTime = getLowestLatestTime(jobs);
const allowCreateWatch = (jobs.length === 1);
this.setState({
@ -91,6 +94,7 @@ export class StartDatafeedModal extends Component {
showCreateWatchFlyout,
allowCreateWatch,
createWatch: false,
now,
});
}
@ -98,6 +102,7 @@ export class StartDatafeedModal extends Component {
const { jobs } = this.state;
const start = moment.isMoment(this.state.startTime) ? this.state.startTime.valueOf() : this.state.startTime;
const end = moment.isMoment(this.state.endTime) ? this.state.endTime.valueOf() : this.state.endTime;
forceStartDatafeeds(jobs, start, end, () => {
if (this.state.createWatch && jobs.length === 1) {
const jobId = jobs[0].id;
@ -112,10 +117,14 @@ export class StartDatafeedModal extends Component {
const {
jobs,
initialSpecifiedStartTime,
startTime,
endTime,
createWatch
createWatch,
now,
} = this.state;
const startableJobs = (jobs !== undefined) ? jobs.filter(j => j.hasDatafeed) : [];
// disable start button if the start and end times are the same
const startDisabled = (startTime !== undefined && (startTime === endTime));
let modal;
if (this.state.isModalVisible) {
@ -133,10 +142,11 @@ export class StartDatafeedModal extends Component {
<EuiModalBody>
<TimeRangeSelector
startTime={initialSpecifiedStartTime}
startTime={(startTime === undefined) ? initialSpecifiedStartTime : startTime}
endTime={endTime}
setStartTime={this.setStartTime}
setEndTime={this.setEndTime}
now={now}
/>
{
this.state.endTime === undefined &&
@ -161,6 +171,7 @@ export class StartDatafeedModal extends Component {
<EuiButton
onClick={this.save}
isDisabled={startDisabled}
fill
>
Start

7
x-pack/plugins/ml/public/jobs/jobs_list/components/start_datafeed_modal/time_range_selector/time_range_selector.js
View file

@ -29,6 +29,7 @@ export class TimeRangeSelector extends Component {
endTab: 1,
};
this.latestTimeStamp = this.props.startTime;
this.now = this.props.now;
}
setStartTab = (tab) => {
@ -38,7 +39,7 @@ export class TimeRangeSelector extends Component {
this.setStartTime(undefined);
break;
case 1:
this.setStartTime('now');
this.setStartTime(this.now);
break;
default:
break;
@ -52,7 +53,7 @@ export class TimeRangeSelector extends Component {
this.setEndTime(undefined);
break;
case 1:
this.setEndTime(moment());
this.setEndTime(this.now);
break;
default:
break;
@ -70,7 +71,7 @@ export class TimeRangeSelector extends Component {
getTabItems() {
const datePickerTimes = {
start: (moment.isMoment(this.props.startTime)) ? this.props.startTime : this.latestTimeStamp,
end: (moment.isMoment(this.props.endTime)) ? this.props.endTime : moment()
end: (moment.isMoment(this.props.endTime)) ? this.props.endTime : this.now,
};
const formattedStartTime = this.latestTimeStamp.format(TIME_FORMAT);
const startItems = [