From 208fd91874e94b59b1b5238a27a917b8e135039f Mon Sep 17 00:00:00 2001 From: Yaroslav Kuznietsov Date: Thu, 26 Aug 2021 11:54:11 +0300 Subject: [PATCH 1/2] Added mock for `es_service`. --- .../components/datasource/datasource_component.js | 2 +- .../plugins/canvas/storybook/__mocks__/es_service.ts | 10 ++++++++++ x-pack/plugins/canvas/storybook/main.ts | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 x-pack/plugins/canvas/storybook/__mocks__/es_service.ts diff --git a/x-pack/plugins/canvas/public/components/datasource/datasource_component.js b/x-pack/plugins/canvas/public/components/datasource/datasource_component.js index c1df18fc06d55..3f8a0005f0551 100644 --- a/x-pack/plugins/canvas/public/components/datasource/datasource_component.js +++ b/x-pack/plugins/canvas/public/components/datasource/datasource_component.js @@ -20,7 +20,7 @@ import { import { isEqual } from 'lodash'; import { i18n } from '@kbn/i18n'; -import { getDefaultIndex } from '../../lib/es_service'; +import { getDefaultIndex } from '../../../public/lib/es_service'; import { DatasourceSelector } from './datasource_selector'; import { DatasourcePreview } from './datasource_preview'; diff --git a/x-pack/plugins/canvas/storybook/__mocks__/es_service.ts b/x-pack/plugins/canvas/storybook/__mocks__/es_service.ts new file mode 100644 index 0000000000000..686fd7b4fa947 --- /dev/null +++ b/x-pack/plugins/canvas/storybook/__mocks__/es_service.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export const getDefaultIndex = () => { + return Promise.resolve('Demonstration index'); +}; diff --git a/x-pack/plugins/canvas/storybook/main.ts b/x-pack/plugins/canvas/storybook/main.ts index 69c05322cf3f0..5ab43484a1599 100644 --- a/x-pack/plugins/canvas/storybook/main.ts +++ b/x-pack/plugins/canvas/storybook/main.ts @@ -56,6 +56,10 @@ const canvasWebpack = { resolve: { alias: { 'src/plugins': resolve(KIBANA_ROOT, 'src/plugins'), + '../../../public/lib/es_service': resolve( + KIBANA_ROOT, + 'x-pack/plugins/canvas/storybook/__mocks__/es_service.ts' + ), }, }, }; From 758ccde44338856d510f6eaa8caa2f24efea1615 Mon Sep 17 00:00:00 2001 From: Yaroslav Kuznietsov Date: Fri, 27 Aug 2021 09:23:01 +0300 Subject: [PATCH 2/2] Reverted import path. --- .../canvas/public/components/datasource/datasource_component.js | 2 +- x-pack/plugins/canvas/storybook/main.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/canvas/public/components/datasource/datasource_component.js b/x-pack/plugins/canvas/public/components/datasource/datasource_component.js index 3f8a0005f0551..c1df18fc06d55 100644 --- a/x-pack/plugins/canvas/public/components/datasource/datasource_component.js +++ b/x-pack/plugins/canvas/public/components/datasource/datasource_component.js @@ -20,7 +20,7 @@ import { import { isEqual } from 'lodash'; import { i18n } from '@kbn/i18n'; -import { getDefaultIndex } from '../../../public/lib/es_service'; +import { getDefaultIndex } from '../../lib/es_service'; import { DatasourceSelector } from './datasource_selector'; import { DatasourcePreview } from './datasource_preview'; diff --git a/x-pack/plugins/canvas/storybook/main.ts b/x-pack/plugins/canvas/storybook/main.ts index 5ab43484a1599..a043efd7c87f5 100644 --- a/x-pack/plugins/canvas/storybook/main.ts +++ b/x-pack/plugins/canvas/storybook/main.ts @@ -56,7 +56,7 @@ const canvasWebpack = { resolve: { alias: { 'src/plugins': resolve(KIBANA_ROOT, 'src/plugins'), - '../../../public/lib/es_service': resolve( + '../../lib/es_service': resolve( KIBANA_ROOT, 'x-pack/plugins/canvas/storybook/__mocks__/es_service.ts' ),