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

[Canvas] Fixes error handling of NetworkErrors (#28282)

Browse source 
* Fixes error handling with NetworkErrors

* Removed lodash get
This commit is contained in:
Catherine Liu 2019-01-09 14:56:55 -07:00 • committed by GitHub
parent b57461117d
commit baa7ac2c70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/canvas/public/apps/workpad/routes.js
View file

@ -33,7 +33,7 @@ export const routes = [
notify.error(err, { title: `Couldn't create workpad` });
// TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced
// https://github.com/elastic/kibana/issues/20277
if (err.response.status === 403) {
if (err.response && err.response.status === 403) {
dispatch(setCanUserWrite(false));
}
router.redirectTo('home');
@ -61,7 +61,7 @@ export const routes = [
// TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced
// https://github.com/elastic/kibana/issues/20277
workpadService.update(params.id, fetchedWorkpad).catch(err => {
if (err.response.status === 403) {
if (err.response && err.response.status === 403) {
dispatch(setCanUserWrite(false));
}
});

6
x-pack/plugins/canvas/public/components/workpad_loader/index.js
View file

@ -46,7 +46,7 @@ export const WorkpadLoader = compose(
notify.error(err, { title: `Couldn't upload workpad` });
// TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced
// https://github.com/elastic/kibana/issues/20277
if (err.response.status === 403) {
if (err.response && err.response.status === 403) {
props.setCanUserWrite(false);
}
}
@ -81,7 +81,7 @@ export const WorkpadLoader = compose(
notify.error(err, { title: `Couldn't clone workpad` });
// TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced
// https://github.com/elastic/kibana/issues/20277
if (err.response.status === 403) {
if (err.response && err.response.status === 403) {
props.setCanUserWrite(false);
}
}
@ -114,7 +114,7 @@ export const WorkpadLoader = compose(
errors.push(result.id);
// TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced
// https://github.com/elastic/kibana/issues/20277
if (result.err.response.status === 403) {
if (result.err.response && result.err.response.status === 403) {
props.setCanUserWrite(false);
}
} else {

36
x-pack/plugins/canvas/public/state/middleware/es_persist.js
View file

@ -55,26 +55,26 @@ export const esPersistMiddleware = ({ getState }) => {
if (workpadChanged(curState, newState) || assetsChanged(curState, newState)) {
const persistedWorkpad = getWorkpadPersisted(getState());
return update(persistedWorkpad.id, persistedWorkpad).catch(err => {
if (err.response.status === 400) {
return notify.error(err.response, {
title: `Couldn't save your changes to Elasticsearch`,
});
}
if (err.response.status === 413) {
return notify.error(
`The server gave a response that the workpad data was too large. This
usually means uploaded image assets that are too large for Kibana or
a proxy. Try removing some assets in the asset manager.`,
{
const statusCode = err.response && err.response.status;
switch (statusCode) {
case 400:
return notify.error(err.response, {
title: `Couldn't save your changes to Elasticsearch`,
}
);
});
case 413:
return notify.error(
`The server gave a response that the workpad data was too large. This
usually means uploaded image assets that are too large for Kibana or
a proxy. Try removing some assets in the asset manager.`,
{
title: `Couldn't save your changes to Elasticsearch`,
}
);
default:
return notify.error(err, {
title: `Couldn't update workpad`,
});
}
return notify.error(err.response, {
title: `Couldn't update workpad`,
});
});
}
};