valitydev/wazuh-kibana-app
14
0
Fork 0
mirror of https://github.com/valitydev/wazuh-kibana-app.git synced 2024-11-06 09:55:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use errorHandler in visualizations error

Browse Source
This commit is contained in:
JuanCarlos 2019-07-25 15:51:02 +02:00 committed by Jesús Ángel
parent 66290f6d6c
commit 0c9d8c54f5
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
public/kibana-integrations/loader/embedded_visualize_handler.ts
View File

@ -48,7 +48,6 @@ import { RequestHandlerParams, Vis } from 'ui/vis';
import { PipelineDataLoader } from 'ui/visualize/loader/pipeline_data_loader';
import { visualizationLoader } from './visualization_loader';
import { VisualizeDataLoader } from './visualize_data_loader';
import $ from 'jquery';
// @ts-ignore
import { DataAdapter, RequestAdapter } from 'ui/inspector/adapters';
@ -89,7 +88,6 @@ export class EmbeddedVisualizeHandler {
* @ignore
*/
private isToast: any;
public readonly data$: Rx.Observable<any>;
public readonly inspectorAdapters: Adapters = {};
private vis: Vis;
@ -120,11 +118,14 @@ export class EmbeddedVisualizeHandler {
private actions: any = {};
private events$: Rx.Observable<any>;
private autoFetch: boolean;
private errorHandler: any;
constructor(
private readonly element: HTMLElement,
savedObject: VisSavedObject,
params: EmbeddedVisualizeHandlerParams
params: EmbeddedVisualizeHandlerParams,
injector,
errorHandler
) {
const { searchSource, vis } = savedObject;
@ -137,9 +138,11 @@ export class EmbeddedVisualizeHandler {
query,
autoFetch = true,
pipelineDataLoader = false,
Private,
Private
} = params;
this.errorHandler = errorHandler;
this.dataLoaderParams = {
searchSource,
timeRange,
@ -492,19 +495,11 @@ export class EmbeddedVisualizeHandler {
this.vis.showRequestError =
error.type && ['NO_OP_SEARCH_STRATEGY', 'UNSUPPORTED_QUERY'].includes(error.type);
this.isToast = $(".euiToastHeader__title");
//Do not show notification toast if it's already being shown a similar toast
if (this.isToast.length === 0 || (this.isToast.length > 0 && this.isToast[0].outerText !== 'Error in visualization')) {
const err = ((((error.resp || {}).error) || {}).root_cause || [])[0] || [];
const errMsg = err ? `Found ${err.type} error making a query on the ${err.index} index, reason: ${err.reason} ` : error.message;
toastNotifications.addDanger({
title: i18n.translate('common.ui.visualize.dataLoaderError', {
defaultMessage: 'Error in visualization',
}),
text: errMsg,
});
}
this.errorHandler.handle(error.message, i18n.translate('common.ui.visualize.dataLoaderError', {
defaultMessage: 'Error in visualization',
}));
};
private rendererProvider = (response: VisResponseData | null) => {

10
public/kibana-integrations/loader/visualize_loader.ts
View File

@ -32,9 +32,11 @@ import { EmbeddedVisualizeHandler } from './embedded_visualize_handler';
import { VisSavedObject, VisualizeLoaderParams } from './types';
export class VisualizeLoader {
constructor(private readonly savedVisualizations: any, private readonly Private: IPrivate, $injector) {
constructor(private readonly savedVisualizations: any, private readonly Private: IPrivate, $injector, errorHandler) {
// @ts-ignore
this.injector = $injector;
// @ts-ignore
this.errorHandler = errorHandler;
}
/**
@ -142,12 +144,12 @@ export class VisualizeLoader {
Private: this.Private,
};
// @ts-ignore
return new EmbeddedVisualizeHandler(element, savedObj, handlerParams, this.injector);
return new EmbeddedVisualizeHandler(element, savedObj, handlerParams, this.injector, this.errorHandler);
}
}
function VisualizeLoaderProvider(savedVisualizations: any, Private: IPrivate, $injector) {
return new VisualizeLoader(savedVisualizations, Private, $injector);
function VisualizeLoaderProvider(savedVisualizations: any, Private: IPrivate, $injector, errorHandler) {
return new VisualizeLoader(savedVisualizations, Private, $injector, errorHandler);
}
/**