From 337408a449153439ad2f5251f46153b02f842e07 Mon Sep 17 00:00:00 2001 From: Poff Poffenberger Date: Wed, 18 Dec 2019 16:05:39 -0600 Subject: [PATCH] Adding types placeholder --- x-pack/plugins/canvas/server/collectors/collector.ts | 2 +- .../plugins/canvas/server/collectors/collector_helpers.ts | 2 +- .../server/collectors/custom_element_collector.test.ts | 2 +- .../canvas/server/collectors/custom_element_collector.ts | 2 +- .../plugins/canvas/server/collectors/workpad_collector.ts | 6 +----- x-pack/plugins/canvas/types/index.ts | 7 +++++++ 6 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 x-pack/plugins/canvas/types/index.ts diff --git a/x-pack/plugins/canvas/server/collectors/collector.ts b/x-pack/plugins/canvas/server/collectors/collector.ts index e3f455fe00434..8e9e5ede2e7f2 100644 --- a/x-pack/plugins/canvas/server/collectors/collector.ts +++ b/x-pack/plugins/canvas/server/collectors/collector.ts @@ -7,7 +7,7 @@ import { CallCluster } from 'src/legacy/core_plugins/elasticsearch'; import { UsageCollectionSetup } from 'src/plugins/usage_collection/server'; import { CANVAS_USAGE_TYPE } from '../../../../legacy/plugins/canvas/common/lib/constants'; -import { TelemetryCollector } from '../../../../legacy/plugins/canvas/types'; +import { TelemetryCollector } from '../../types'; import { workpadCollector } from './workpad_collector'; import { customElementCollector } from './custom_element_collector'; diff --git a/x-pack/plugins/canvas/server/collectors/collector_helpers.ts b/x-pack/plugins/canvas/server/collectors/collector_helpers.ts index d1de0564e6bb3..784042fb4d94d 100644 --- a/x-pack/plugins/canvas/server/collectors/collector_helpers.ts +++ b/x-pack/plugins/canvas/server/collectors/collector_helpers.ts @@ -9,7 +9,7 @@ * @param cb: callback to do something with a function that has been found */ -import { ExpressionAST, ExpressionArgAST } from '../../../../legacy/plugins/canvas/types'; +import { ExpressionAST, ExpressionArgAST } from '../../types'; function isExpression(maybeExpression: ExpressionArgAST): maybeExpression is ExpressionAST { return typeof maybeExpression === 'object'; diff --git a/x-pack/plugins/canvas/server/collectors/custom_element_collector.test.ts b/x-pack/plugins/canvas/server/collectors/custom_element_collector.test.ts index 89b30e6968e70..f09bb704b09e3 100644 --- a/x-pack/plugins/canvas/server/collectors/custom_element_collector.test.ts +++ b/x-pack/plugins/canvas/server/collectors/custom_element_collector.test.ts @@ -5,7 +5,7 @@ */ import { summarizeCustomElements } from './custom_element_collector'; -import { TelemetryCustomElementDocument } from '../../../../legacy/plugins/canvas/types'; +import { TelemetryCustomElementDocument } from '../../types'; function mockCustomElement(...nodeExpressions: string[]): TelemetryCustomElementDocument { return { diff --git a/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts index e5fa97d757ef8..5f1944bea3eaa 100644 --- a/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts +++ b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts @@ -13,7 +13,7 @@ import { TelemetryCollector, TelemetryCustomElement, TelemetryCustomElementDocument, -} from '../../../../legacy/plugins/canvas/types'; +} from '../../types'; const CUSTOM_ELEMENT_TYPE = 'canvas-element'; interface CustomElementSearch { diff --git a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts index 5394c12939771..6c86b8b2c7468 100644 --- a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts +++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts @@ -9,11 +9,7 @@ import { sum as arraySum, min as arrayMin, max as arrayMax, get } from 'lodash'; import { fromExpression } from '@kbn/interpreter/common'; import { CANVAS_TYPE } from '../../../../legacy/plugins/canvas/common/lib/constants'; import { collectFns } from './collector_helpers'; -import { - ExpressionAST, - TelemetryCollector, - CanvasWorkpad, -} from '../../../../legacy/plugins/canvas/types'; +import { ExpressionAST, TelemetryCollector, CanvasWorkpad } from '../../types'; interface WorkpadSearch { [CANVAS_TYPE]: CanvasWorkpad; diff --git a/x-pack/plugins/canvas/types/index.ts b/x-pack/plugins/canvas/types/index.ts new file mode 100644 index 0000000000000..014b203754a21 --- /dev/null +++ b/x-pack/plugins/canvas/types/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from '../../../legacy/plugins/canvas/types';