github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Better error notifications in jobs list (#20880)

Browse source 
* [ML] Better error notifications in jobs list

* removing test data
This commit is contained in:
James Gowdy 2018-07-17 14:27:28 +01:00 • committed by GitHub
parent 9c9159ce0c
commit 492fb01f8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 67 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

18
x-pack/plugins/ml/public/components/messagebar/messagebar_service.js
View file

@ -5,6 +5,9 @@
*/
import { notify } from 'ui/notify';
import { MLRequestFailure } from 'plugins/ml/util/ml_error';
const messages = [];
@ -56,6 +59,16 @@ function expandErrorMessageObj(resp) {
return txt;
}
function errorNotify(text, resp) {
let err = null;
if (typeof text === 'object' && text.response !== undefined) {
resp = text.response;
} else {
err = new Error(text);
}
notify.error(new MLRequestFailure(err, resp));
}
export const mlMessageBarService = {
getMessages,
addMessage,
@ -63,5 +76,8 @@ export const mlMessageBarService = {
clear,
info,
warning,
error
error,
notify: {
error: errorNotify
}
};

66
x-pack/plugins/ml/public/jobs/jobs_list_new/components/utils.js
View file

@ -6,6 +6,7 @@
import { each } from 'lodash';
import { toastNotifications } from 'ui/notify';
import { mlMessageBarService } from 'plugins/ml/components/messagebar/messagebar_service';
import { mlJobService } from 'plugins/ml/services/job_service';
import { ml } from 'plugins/ml/services/ml_api_service';
@ -18,11 +19,11 @@ export function loadFullJob(jobId) {
if (jobs.length) {
resolve(jobs[0]);
} else {
reject(`Could not find job ${jobId}`);
throw new Error(`Could not find job ${jobId}`);
}
})
.catch(() => {
reject(`Could not find job ${jobId}`);
.catch((error) => {
reject(error);
});
});
}
@ -35,40 +36,32 @@ export function isStoppable(jobs) {
return (jobs.find(j => j.datafeedState === DATAFEED_STATE.STARTED) !== undefined);
}
export function forceStartDatafeeds(jobs, start, end, finish) {
export function forceStartDatafeeds(jobs, start, end, finish = () => {}) {
const datafeedIds = jobs.filter(j => j.hasDatafeed).map(j => j.datafeedId);
mlJobService.forceStartDatafeeds(datafeedIds, start, end)
.then((resp) => {
showResults(resp, DATAFEED_STATE.STARTED);
if (typeof finish === 'function') {
finish();
}
finish();
})
.catch((error) => {
mlMessageBarService.notify.error(error);
toastNotifications.addDanger(`Jobs failed to start`, error);
if (typeof finish === 'function') {
finish();
}
finish();
});
}
export function stopDatafeeds(jobs, finish) {
export function stopDatafeeds(jobs, finish = () => {}) {
const datafeedIds = jobs.filter(j => j.hasDatafeed).map(j => j.datafeedId);
mlJobService.stopDatafeeds(datafeedIds)
.then((resp) => {
showResults(resp, DATAFEED_STATE.STOPPED);
if (typeof finish === 'function') {
finish();
}
finish();
})
.catch((error) => {
mlMessageBarService.notify.error(error);
toastNotifications.addDanger(`Jobs failed to stop`, error);
if (typeof finish === 'function') {
finish();
}
finish();
});
}
@ -76,10 +69,13 @@ function showResults(resp, action) {
const successes = [];
const failures = [];
for (const d in resp) {
if (resp[d][action]) {
if (resp[d][action] === true || (resp[d][action] === false && resp[d].error.statusCode === 409)) {
successes.push(d);
} else {
failures.push(d);
failures.push({
id: d,
result: resp[d]
});
}
}
@ -96,15 +92,16 @@ function showResults(resp, action) {
actionTextPT = 'deleted';
}
if (successes.length > 0) {
successes.forEach((s) => {
toastNotifications.addSuccess(`${s} ${actionTextPT} successfully`);
});
if (successes.length > 1) {
toastNotifications.addSuccess(`${successes.length} jobs ${actionTextPT} successfully`);
} else if (successes.length === 1) {
toastNotifications.addSuccess(`${successes[0]} ${actionTextPT} successfully`);
}
if (failures.length > 0) {
failures.forEach((s) => {
toastNotifications.addDanger(`${s} failed to ${actionText}`);
failures.forEach((f) => {
mlMessageBarService.notify.error(f.result.error);
toastNotifications.addDanger(`${f.id} failed to ${actionText}`);
});
}
}
@ -115,26 +112,23 @@ export function cloneJob(jobId) {
mlJobService.currentJob = job;
window.location.href = `#/jobs/new_job`;
})
.catch(() => {
.catch((error) => {
mlMessageBarService.notify.error(error);
toastNotifications.addDanger(`Could not clone ${jobId}. Job could not be found`);
});
}
export function deleteJobs(jobs, finish) {
export function deleteJobs(jobs, finish = () => {}) {
const jobIds = jobs.map(j => j.id);
mlJobService.deleteJobs(jobIds)
.then((resp) => {
showResults(resp, DATAFEED_STATE.DELETED);
if (typeof finish === 'function') {
finish();
}
finish();
})
.catch((error) => {
mlMessageBarService.notify.error(error);
toastNotifications.addDanger(`Jobs failed to delete`, error);
if (typeof finish === 'function') {
finish();
}
finish();
});
}

20
x-pack/plugins/ml/public/util/ml_error.js Normal file
View file

@ -0,0 +1,20 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import { KbnError } from 'ui/errors';
export class MLRequestFailure extends KbnError {
// takes an Error object and and optional response object
// if error is falsy (null) the response object will be used
// notify will show the full expandable stack trace of the response if a response object is used and no error is passed in.
constructor(error, resp) {
error = error || {};
super(error.message || JSON.stringify(resp), MLRequestFailure);
this.origError = error;
this.resp = (typeof resp === 'string') ? JSON.parse(resp) : resp;
}
}