diff --git a/webapp/packages/core-app/src/AppScreen/Main.tsx b/webapp/packages/core-app/src/AppScreen/Main.tsx index 53a33cc157..4e7852f2a8 100644 --- a/webapp/packages/core-app/src/AppScreen/Main.tsx +++ b/webapp/packages/core-app/src/AppScreen/Main.tsx @@ -16,10 +16,9 @@ import { ConnectionExecutionContextResource, ConnectionInfoResource } from '@clo import { useService } from '@cloudbeaver/core-di'; import { CachedMapAllKey } from '@cloudbeaver/core-sdk'; import { useStyles } from '@cloudbeaver/core-theming'; +import { SideBarPanel, SideBarPanelService } from '@cloudbeaver/core-ui'; import { NavigationTree } from '../NavigationTree'; -import { SideBarPanel } from '../shared/SideBarPanel/SideBarPanel'; -import { SideBarPanelService } from '../shared/SideBarPanel/SideBarPanelService'; import { RightArea } from './RightArea'; const mainStyles = css` diff --git a/webapp/packages/core-app/src/index.ts b/webapp/packages/core-app/src/index.ts index e349c2de6a..bd4829cf4f 100644 --- a/webapp/packages/core-app/src/index.ts +++ b/webapp/packages/core-app/src/index.ts @@ -33,7 +33,6 @@ export * from './shared/NavigationTabs/TabNavigationContext'; export * from './shared/ToolsPanel/LogViewer/LogViewerBootstrap'; export * from './shared/ToolsPanel/LogViewer/LogViewerService'; export * from './shared/ToolsPanel/ToolsPanelService'; -export * from './shared/SideBarPanel/SideBarPanelService'; export * from './shared/SessionExpireDialog/SessionExpiredDialogService'; export * from './shared/SessionExpireWarningDialog/SessionExpireWarningDialogService'; diff --git a/webapp/packages/core-bootstrap/src/manifest.ts b/webapp/packages/core-bootstrap/src/manifest.ts index 3fa75d543b..277707da20 100644 --- a/webapp/packages/core-bootstrap/src/manifest.ts +++ b/webapp/packages/core-bootstrap/src/manifest.ts @@ -44,7 +44,6 @@ import { NavigationTreeBootstrap, ToolsPanelService, QuotasService, - SideBarPanelService } from '@cloudbeaver/core-app'; import { coreAuthenticationManifest } from '@cloudbeaver/core-authentication'; import { BlocksLocaleService } from '@cloudbeaver/core-blocks'; @@ -124,7 +123,6 @@ export const coreManifests: PluginManifest[] = [ ThemeSettingsService, ThemeService, ToolsPanelService, - SideBarPanelService, ], }, coreSDKManifest, diff --git a/webapp/packages/core-app/src/shared/SideBarPanel/SideBarPanel.tsx b/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx similarity index 100% rename from webapp/packages/core-app/src/shared/SideBarPanel/SideBarPanel.tsx rename to webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx diff --git a/webapp/packages/core-app/src/shared/SideBarPanel/SideBarPanelService.ts b/webapp/packages/core-ui/src/SideBarPanel/SideBarPanelService.ts similarity index 100% rename from webapp/packages/core-app/src/shared/SideBarPanel/SideBarPanelService.ts rename to webapp/packages/core-ui/src/SideBarPanel/SideBarPanelService.ts diff --git a/webapp/packages/core-ui/src/index.ts b/webapp/packages/core-ui/src/index.ts index 6b3cf0042b..f79ad0882c 100644 --- a/webapp/packages/core-ui/src/index.ts +++ b/webapp/packages/core-ui/src/index.ts @@ -51,6 +51,9 @@ export * from './Tabs/TabsBootstrap'; export * from './Tabs/TabsBox/TabsBox'; export * from './Tabs/TabsBox/TabsBoxFromArray'; +export * from './SideBarPanel/SideBarPanel'; +export * from './SideBarPanel/SideBarPanelService'; + export * from './AuthenticationProvider'; export * from './useAuthenticationAction'; export { manifest as coreUIManifest } from './manifest'; diff --git a/webapp/packages/core-ui/src/manifest.ts b/webapp/packages/core-ui/src/manifest.ts index 41edeacbe4..e9663c8cd1 100644 --- a/webapp/packages/core-ui/src/manifest.ts +++ b/webapp/packages/core-ui/src/manifest.ts @@ -14,6 +14,7 @@ import { ClipboardService } from './Clipboard/ClipboardService'; import { LocaleService } from './LocaleService'; import { NavigationService } from './Screens/AppScreen/NavigationService'; import { OptionsPanelService } from './Screens/AppScreen/OptionsPanelService'; +import { SideBarPanelService } from './SideBarPanel/SideBarPanelService'; import { TabsBootstrap } from './Tabs/TabsBootstrap'; export const manifest: PluginManifest = { @@ -27,6 +28,7 @@ export const manifest: PluginManifest = { ClipboardBootstrap, ClipboardService, TabsBootstrap, + SideBarPanelService, LocaleService, ], }; diff --git a/webapp/packages/plugin-resource-manager/src/PluginBootstrap.ts b/webapp/packages/plugin-resource-manager/src/PluginBootstrap.ts index 45b5b292b4..3f485f2ed7 100644 --- a/webapp/packages/plugin-resource-manager/src/PluginBootstrap.ts +++ b/webapp/packages/plugin-resource-manager/src/PluginBootstrap.ts @@ -9,7 +9,7 @@ import { EMainMenu, MainMenuService } from '@cloudbeaver/core-app'; import { AuthInfoService } from '@cloudbeaver/core-authentication'; import { Bootstrap, injectable } from '@cloudbeaver/core-di'; -import { SideBarPanelService } from '@cloudbeaver/core-app'; +import { SideBarPanelService } from '@cloudbeaver/core-ui'; import { ResourceManager } from './ResourceManager'; import { ResourceManagerService } from './ResourceManagerService';