Merge remote-tracking branch 'origin/devel' into devel

webapp/packages/basic-connection-plugin/src/BasicConnectionPluginBootstrap.ts

@@ -7,7 +7,7 @@
  */
 
 import { MainMenuService, ConnectionDialogsService } from '@dbeaver/core/app';
-import { injectable, Bootstrap } from '@dbeaver/core/di';
+import { injectable } from '@dbeaver/core/di';
 import { CommonDialogService } from '@dbeaver/core/dialogs';
 import { NotificationService } from '@dbeaver/core/eventsLog';
 import { PermissionsService, EPermission, SessionService } from '@dbeaver/core/root';
@@ -16,7 +16,7 @@ import { BasicConnectionService } from './BasicConnectionService';
 import { ConnectionDialog } from './ConnectionDialog/ConnectionDialog';
 
 @injectable()
-export class BasicConnectionPluginBootstrap extends Bootstrap {
+export class BasicConnectionPluginBootstrap {
 
   constructor(
     private connectionDialogsService: ConnectionDialogsService,
@@ -27,7 +27,6 @@ export class BasicConnectionPluginBootstrap extends Bootstrap {
     private permissionsService: PermissionsService,
     private sessionService: SessionService
   ) {
-    super();
   }
 
   bootstrap() {

webapp/packages/basic-connection-plugin/src/manifest.ts

@@ -8,6 +8,7 @@
 
 import { PluginManifest } from '@dbeaver/core/di';
 
+import { BasicConnectionPluginBootstrap } from './BasicConnectionPluginBootstrap';
 import { BasicConnectionService } from './BasicConnectionService';
 
 export const basicConnectionPluginManifest: PluginManifest = {
@@ -18,4 +19,10 @@ export const basicConnectionPluginManifest: PluginManifest = {
   providers: [
     BasicConnectionService,
   ],
+
+  initialize(services): void {
+    services
+      .resolveServiceByClass(BasicConnectionPluginBootstrap)
+      .bootstrap();
+  },
 };