Skip to content

Commit

Permalink
Fix merge type error
Browse files Browse the repository at this point in the history
  • Loading branch information
sphilipse committed Jul 19, 2023
1 parent 9821fef commit 1a1ed22
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
4 changes: 2 additions & 2 deletions x-pack/plugins/serverless_search/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/serverless_search/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand All @@ -27,7 +26,6 @@ export interface ServerlessSearchPluginSetupDependencies {
export interface ServerlessSearchPluginStartDependencies {
cloud: CloudStart;
management: ManagementStart;
observabilityShared: ObservabilitySharedPluginStart;
security: SecurityPluginStart;
serverless: ServerlessPluginStart;
share: SharePluginStart;
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/serverless_search/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
"@kbn/ml-plugin",
"@kbn/management-cards-navigation",
"@kbn/core-elasticsearch-server",
"@kbn/observability-shared-plugin",
]
}

0 comments on commit 1a1ed22

Please sign in to comment.