From 3c2e61bf15fe2a7b1aedbc700e8abf79457cd2d9 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Wed, 18 Dec 2024 10:49:33 -0700 Subject: [PATCH 1/4] [embeddable] remove export of inspector-plugin types --- src/plugins/embeddable/public/index.ts | 1 - src/plugins/embeddable/public/lib/embeddables/embeddable.tsx | 2 +- src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts | 2 +- src/plugins/embeddable/public/lib/types.ts | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/embeddable/public/index.ts b/src/plugins/embeddable/public/index.ts index c5de8a9d7631f..ad5857ac871a6 100644 --- a/src/plugins/embeddable/public/index.ts +++ b/src/plugins/embeddable/public/index.ts @@ -53,7 +53,6 @@ export { withEmbeddableSubscription, } from './lib'; export type { - Adapters, CellValueContext, ChartActionContext, EmbeddableContext, diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx index f20d65de3d60d..3af13b3d998a3 100644 --- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx +++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx @@ -13,7 +13,7 @@ import * as Rx from 'rxjs'; import { merge } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, skip } from 'rxjs'; import { RenderCompleteDispatcher } from '@kbn/kibana-utils-plugin/public'; -import { Adapters } from '../types'; +import { Adapters } from '@kbn/inspector-plugin/public'; import { EmbeddableError, EmbeddableOutput, IEmbeddable } from './i_embeddable'; import { EmbeddableInput, ViewMode } from '../../../common/types'; import { genericEmbeddableInputIsEqual, omitGenericEmbeddableInput } from './diff_embeddable_input'; diff --git a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts index 8cac11a075d1a..51a24527dd4aa 100644 --- a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts +++ b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts @@ -8,9 +8,9 @@ */ import { ErrorLike } from '@kbn/expressions-plugin/common'; +import { Adapters } from '@kbn/inspector-plugin/public'; import { Observable } from 'rxjs'; import { EmbeddableInput } from '../../../common/types'; -import { Adapters } from '../types'; export type EmbeddableError = ErrorLike; export type { EmbeddableInput }; diff --git a/src/plugins/embeddable/public/lib/types.ts b/src/plugins/embeddable/public/lib/types.ts index 936867be43712..9a3f98891235d 100644 --- a/src/plugins/embeddable/public/lib/types.ts +++ b/src/plugins/embeddable/public/lib/types.ts @@ -7,8 +7,6 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -import { Adapters } from './inspector'; - export interface Trigger { id: string; title?: string; @@ -23,7 +21,6 @@ export interface PropertySpec { value?: string; } export { ViewMode } from '../../common/types'; -export type { Adapters }; export interface CommonlyUsedRange { from: string; From 0a17d28dda5c681089b497cdea8897e9b08b98ab Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Wed, 18 Dec 2024 10:55:04 -0700 Subject: [PATCH 2/4] maps import --- x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx index 94c993c6aeff4..22ba9698ab8d7 100644 --- a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx +++ b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx @@ -15,7 +15,7 @@ import { KibanaExecutionContext, ScopedHistory, } from '@kbn/core/public'; -import { Adapters } from '@kbn/embeddable-plugin/public'; +import { Adapters } from '@kbn/inspector-plugin/public'; import { Subscription } from 'rxjs'; import { type Filter, FilterStateStore, type Query, type TimeRange } from '@kbn/es-query'; import type { DataViewSpec } from '@kbn/data-views-plugin/public'; From 3cb880ac515c303ecc82dcaeb12b0ce7c32e12f2 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Wed, 18 Dec 2024 11:45:49 -0700 Subject: [PATCH 3/4] tslint visualizations --- .../public/legacy/embeddable/visualize_embeddable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/visualizations/public/legacy/embeddable/visualize_embeddable.tsx b/src/plugins/visualizations/public/legacy/embeddable/visualize_embeddable.tsx index 3ef1947dc5d3d..02f816a5983ba 100644 --- a/src/plugins/visualizations/public/legacy/embeddable/visualize_embeddable.tsx +++ b/src/plugins/visualizations/public/legacy/embeddable/visualize_embeddable.tsx @@ -21,8 +21,8 @@ import { TimefilterContract } from '@kbn/data-plugin/public'; import type { DataView } from '@kbn/data-views-plugin/public'; import { Warnings } from '@kbn/charts-plugin/public'; import { hasUnsupportedDownsampledAggregationFailure } from '@kbn/search-response-warnings'; +import { Adapters } from '@kbn/inspector-plugin/public'; import { - Adapters, Embeddable, EmbeddableInput, EmbeddableOutput, From a898c6fbd10f05b9c3f3e52870dfc239c3e93ed4 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Wed, 18 Dec 2024 13:26:24 -0700 Subject: [PATCH 4/4] delete inspectors re-import --- src/plugins/embeddable/public/lib/inspector.ts | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 src/plugins/embeddable/public/lib/inspector.ts diff --git a/src/plugins/embeddable/public/lib/inspector.ts b/src/plugins/embeddable/public/lib/inspector.ts deleted file mode 100644 index d90af7c751d81..0000000000000 --- a/src/plugins/embeddable/public/lib/inspector.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * 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", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export * from '@kbn/inspector-plugin/public';