From 1a1ed22a0798c067f39c043f277744678ca410a6 Mon Sep 17 00:00:00 2001 From: Sander Philipse Date: Wed, 19 Jul 2023 12:06:03 +0800 Subject: [PATCH] Fix merge type error --- x-pack/plugins/serverless_search/public/plugin.ts | 4 ++-- x-pack/plugins/serverless_search/public/types.ts | 2 -- x-pack/plugins/serverless_search/tsconfig.json | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/serverless_search/public/plugin.ts b/x-pack/plugins/serverless_search/public/plugin.ts index bfd77a7acf6b2..b4914b710bafa 100644 --- a/x-pack/plugins/serverless_search/public/plugin.ts +++ b/x-pack/plugins/serverless_search/public/plugin.ts @@ -69,10 +69,10 @@ export class ServerlessSearchPlugin public start( core: CoreStart, - { serverless, management, observabilityShared, cloud }: ServerlessSearchPluginStartDependencies + { serverless, management, cloud }: ServerlessSearchPluginStartDependencies ): ServerlessSearchPluginStart { serverless.setProjectHome('/app/elasticsearch'); - serverless.setSideNavComponent(createComponent(core, { serverless })); + serverless.setSideNavComponent(createComponent(core, { serverless, cloud })); management.setupCardsNavigation({ enabled: true, hideLinksTo: [appIds.MAINTENANCE_WINDOWS], diff --git a/x-pack/plugins/serverless_search/public/types.ts b/x-pack/plugins/serverless_search/public/types.ts index 137c12a37e683..5b984289e2bd7 100644 --- a/x-pack/plugins/serverless_search/public/types.ts +++ b/x-pack/plugins/serverless_search/public/types.ts @@ -10,7 +10,6 @@ import { ManagementSetup, ManagementStart } from '@kbn/management-plugin/public' import { SecurityPluginStart } from '@kbn/security-plugin/public'; import { ServerlessPluginSetup, ServerlessPluginStart } from '@kbn/serverless/public'; import { SharePluginStart } from '@kbn/share-plugin/public'; -import { ObservabilitySharedPluginStart } from '@kbn/observability-shared-plugin/public'; // eslint-disable-next-line @typescript-eslint/no-empty-interface export interface ServerlessSearchPluginSetup {} @@ -27,7 +26,6 @@ export interface ServerlessSearchPluginSetupDependencies { export interface ServerlessSearchPluginStartDependencies { cloud: CloudStart; management: ManagementStart; - observabilityShared: ObservabilitySharedPluginStart; security: SecurityPluginStart; serverless: ServerlessPluginStart; share: SharePluginStart; diff --git a/x-pack/plugins/serverless_search/tsconfig.json b/x-pack/plugins/serverless_search/tsconfig.json index af420adfd6140..91a3f465ca4c6 100644 --- a/x-pack/plugins/serverless_search/tsconfig.json +++ b/x-pack/plugins/serverless_search/tsconfig.json @@ -30,6 +30,5 @@ "@kbn/ml-plugin", "@kbn/management-cards-navigation", "@kbn/core-elasticsearch-server", - "@kbn/observability-shared-plugin", ] }