From 8df23ca9bcc759e15f95d5cfae91356703b2940d Mon Sep 17 00:00:00 2001 From: joe fleming Date: Fri, 16 Nov 2018 13:45:52 -0700 Subject: [PATCH 1/4] fix: relative link instead of static --- x-pack/plugins/canvas/public/components/workpad_export/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/canvas/public/components/workpad_export/index.js b/x-pack/plugins/canvas/public/components/workpad_export/index.js index 3e1a1dce705585..eaa4691b718392 100644 --- a/x-pack/plugins/canvas/public/components/workpad_export/index.js +++ b/x-pack/plugins/canvas/public/components/workpad_export/index.js @@ -6,9 +6,9 @@ /* eslint import/no-unresolved: 1 */ // TODO: remove eslint rule when updating to use the linked kibana resolve package -import { jobCompletionNotifications } from 'plugins/reporting/lib/job_completion_notifications'; import { connect } from 'react-redux'; import { compose, withProps } from 'recompose'; +import { jobCompletionNotifications } from '../../../../reporting/public/lib/job_completion_notifications'; import { getWorkpad, getPages } from '../../state/selectors/workpad'; import { getReportingBrowserType } from '../../state/selectors/app'; import { notify } from '../../lib/notify'; From 50cff8d1aa1c4c8732b134628cacaf73ec2533d6 Mon Sep 17 00:00:00 2001 From: joe fleming Date: Fri, 16 Nov 2018 14:06:31 -0700 Subject: [PATCH 2/4] fix: handle missing reporting config value --- x-pack/plugins/canvas/init.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/canvas/init.js b/x-pack/plugins/canvas/init.js index 4ce65ff6830243..3b9dffecadc78f 100644 --- a/x-pack/plugins/canvas/init.js +++ b/x-pack/plugins/canvas/init.js @@ -15,7 +15,13 @@ export default async function(server /*options*/) { server.injectUiAppVars('canvas', () => { const config = server.config(); const basePath = config.get('server.basePath'); - const reportingBrowserType = config.get('xpack.reporting.capture.browser.type'); + const reportingBrowserType = (() => { + try { + return config.get('xpack.reporting.capture.browser.type'); + } catch (e) { + return null; + } + })(); return { kbnIndex: config.get('kibana.index'), From fd09ef0db08428a5bab26128ce36ec61041b6a72 Mon Sep 17 00:00:00 2001 From: joe fleming Date: Wed, 28 Nov 2018 14:09:22 -0700 Subject: [PATCH 3/4] chore: refactor reportingBrowserType check --- x-pack/plugins/canvas/init.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/canvas/init.js b/x-pack/plugins/canvas/init.js index 3b9dffecadc78f..3e1f40697ed8c3 100644 --- a/x-pack/plugins/canvas/init.js +++ b/x-pack/plugins/canvas/init.js @@ -16,11 +16,9 @@ export default async function(server /*options*/) { const config = server.config(); const basePath = config.get('server.basePath'); const reportingBrowserType = (() => { - try { - return config.get('xpack.reporting.capture.browser.type'); - } catch (e) { - return null; - } + const configKey = 'xpack.reporting.capture.browser.type'; + if (!config.has(configKey)) return null; + return config.get(configKey); })(); return { From ee8605d69c879553e836b86e9db94c9e5f5cd1cd Mon Sep 17 00:00:00 2001 From: joe fleming Date: Wed, 28 Nov 2018 14:10:46 -0700 Subject: [PATCH 4/4] fix: core interpreter reportingBrowserType the code was duplicated from canvas, so it's equally as broken, this duplicates the fix --- src/core_plugins/interpreter/init.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core_plugins/interpreter/init.js b/src/core_plugins/interpreter/init.js index c48c60ec4bd07d..74d07d60b480af 100644 --- a/src/core_plugins/interpreter/init.js +++ b/src/core_plugins/interpreter/init.js @@ -25,7 +25,11 @@ export default async function (server /*options*/) { server.injectUiAppVars('canvas', () => { const config = server.config(); const basePath = config.get('server.basePath'); - const reportingBrowserType = config.get('xpack.reporting.capture.browser.type'); + const reportingBrowserType = (() => { + const configKey = 'xpack.reporting.capture.browser.type'; + if (!config.has(configKey)) return null; + return config.get(configKey); + })(); return { kbnIndex: config.get('kibana.index'),