- {noResults ? (
+ {requestError ? (
+
+ ) : noResults ? (
) : (
diff --git a/src/ui/public/visualize/components/visualization_requesterror.test.js b/src/ui/public/visualize/components/visualization_requesterror.test.js
new file mode 100644
index 0000000000000..6a07c9ec4e145
--- /dev/null
+++ b/src/ui/public/visualize/components/visualization_requesterror.test.js
@@ -0,0 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { render } from 'enzyme';
+import { VisualizationRequestError } from './visualization_requesterror';
+
+describe('VisualizationRequestError', () => {
+ it('should render according to snapshot', () => {
+ const wrapper = render(
);
+ expect(wrapper).toMatchSnapshot();
+ });
+
+ it('should set html when error is an object', () => {
+ const wrapper = render(
);
+ expect(wrapper.text()).toBe('Request error');
+ });
+
+ it('should set html when error is a string', () => {
+ const wrapper = render(
);
+ expect(wrapper.text()).toBe('Request error');
+ });
+});
diff --git a/src/ui/public/visualize/components/visualization_requesterror.tsx b/src/ui/public/visualize/components/visualization_requesterror.tsx
new file mode 100644
index 0000000000000..8dbec10973d50
--- /dev/null
+++ b/src/ui/public/visualize/components/visualization_requesterror.tsx
@@ -0,0 +1,62 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { EuiText } from '@elastic/eui';
+import React from 'react';
+import { SearchError } from 'ui/courier';
+import { dispatchRenderComplete } from '../../render_complete';
+
+interface VisualizationRequestErrorProps {
+ onInit?: () => void;
+ error: SearchError | string;
+}
+
+export class VisualizationRequestError extends React.Component
{
+ private containerDiv = React.createRef();
+
+ public render() {
+ const { error } = this.props;
+ const errorMessage = (error && error.message) || error;
+
+ return (
+
+
+ {errorMessage}
+
+
+ );
+ }
+
+ public componentDidMount() {
+ this.afterRender();
+ }
+
+ public componentDidUpdate() {
+ this.afterRender();
+ }
+
+ private afterRender() {
+ if (this.props.onInit) {
+ this.props.onInit();
+ }
+ if (this.containerDiv.current) {
+ dispatchRenderComplete(this.containerDiv.current);
+ }
+ }
+}
diff --git a/src/ui/public/visualize/loader/visualize_data_loader.ts b/src/ui/public/visualize/loader/visualize_data_loader.ts
index 780a4d21efc7d..6b6fbf5ba46bd 100644
--- a/src/ui/public/visualize/loader/visualize_data_loader.ts
+++ b/src/ui/public/visualize/loader/visualize_data_loader.ts
@@ -67,8 +67,10 @@ export class VisualizeDataLoader {
this.responseHandler = getHandler(responseHandlers, responseHandler);
}
- public async fetch(params: RequestHandlerParams): Promise {
+ public fetch = async (params: RequestHandlerParams): Promise => {
this.vis.filters = { timeRange: params.timeRange };
+ this.vis.requestError = undefined;
+ this.vis.showRequestError = false;
try {
// searchSource is only there for courier request handler
@@ -95,6 +97,7 @@ export class VisualizeDataLoader {
} catch (e) {
params.searchSource.cancelQueued();
this.vis.requestError = e;
+ this.vis.showRequestError = e.type && e.type === 'UNSUPPORTED_QUERY';
if (isTermSizeZeroError(e)) {
return toastNotifications.addDanger(
`Your visualization ('${this.vis.title}') has an error: it has a term ` +
@@ -107,5 +110,5 @@ export class VisualizeDataLoader {
text: e.message,
});
}
- }
+ };
}
diff --git a/x-pack/plugins/rollup/public/search/rollup_search_strategy.js b/x-pack/plugins/rollup/public/search/rollup_search_strategy.js
index 0b4f446981508..ea5d7f9bd5b4e 100644
--- a/x-pack/plugins/rollup/public/search/rollup_search_strategy.js
+++ b/x-pack/plugins/rollup/public/search/rollup_search_strategy.js
@@ -5,7 +5,7 @@
*/
import { kfetchAbortable } from 'ui/kfetch';
-import { SearchError } from 'ui/courier';
+import { SearchError, getSearchErrorType } from 'ui/courier';
function getAllFetchParams(searchRequests, Promise) {
return Promise.map(searchRequests, (searchRequest) => {
@@ -118,8 +118,9 @@ export const rollupSearchStrategy = {
const searchError = new SearchError({
status: statusText,
title,
- message,
+ message: `Rollup search error: ${message}`,
path: url,
+ type: getSearchErrorType({ message }),
});
reject(searchError);