From 8e2ec49f88bf24699e0242eb14fc5695ff7bcabb Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Fri, 27 May 2022 12:49:00 +0200
Subject: [PATCH] fix(plugin-resource-manager-administration): CB-2066 add rm
 enable option to the existing group

---
 .../ServerConfiguration/ServerConfigurationPage.tsx        | 6 +++++-
 .../ServerConfiguration/ServerConfigurationService.ts      | 2 +-
 .../src/PluginBootstrap.ts                                 | 2 +-
 .../src/ResourceManagerSettings.tsx                        | 6 +++---
 .../plugin-resource-manager/src/ResourceManagerService.ts  | 7 +++----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
index 33914c9127..5fce6cef5a 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
@@ -126,7 +126,11 @@ export const ServerConfigurationPage: AdministrationItemContentComponent = obser
                 <ServerConfigurationConfigurationForm serverConfig={service.state.serverConfig} />
                 <ServerConfigurationNavigatorViewForm configs={service.state} />
                 <ServerConfigurationFeaturesForm state={service.state} configurationWizard={configurationWizard} />
-                <Placeholder container={service.pluginsContainer} />
+                <Placeholder
+                  container={service.pluginsContainer}
+                  configurationWizard={configurationWizard}
+                  state={service.state}
+                />
               </Group>
               <Placeholder
                 container={service.configurationContainer}
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts
index 7e87ede849..f64e937619 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts
@@ -45,7 +45,7 @@ export class ServerConfigurationService {
   readonly saveTask: IExecutor<IServerConfigSaveData>;
   readonly validationTask: IExecutor<IServerConfigSaveData>;
   readonly configurationContainer: PlaceholderContainer<IConfigurationPlaceholderProps>;
-  readonly pluginsContainer: PlaceholderContainer;
+  readonly pluginsContainer: PlaceholderContainer<IConfigurationPlaceholderProps>;
 
   private done: boolean;
   private stateLinked: boolean;
diff --git a/webapp/packages/plugin-resource-manager-administration/src/PluginBootstrap.ts b/webapp/packages/plugin-resource-manager-administration/src/PluginBootstrap.ts
index c759eea3e2..52449aeaf2 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-resource-manager-administration/src/PluginBootstrap.ts
@@ -27,7 +27,7 @@ export class PluginBootstrap extends Bootstrap {
   }
 
   register(): void | Promise<void> {
-    this.serverConfigurationService.configurationContainer.add(ResourceManagerSettings, 1);
+    this.serverConfigurationService.pluginsContainer.add(ResourceManagerSettings, 0);
     this.serverConfigurationService.loadConfigTask.addHandler(this.loadConfigHandler);
   }
 
diff --git a/webapp/packages/plugin-resource-manager-administration/src/ResourceManagerSettings.tsx b/webapp/packages/plugin-resource-manager-administration/src/ResourceManagerSettings.tsx
index 749f4fdf2f..8efa05619b 100644
--- a/webapp/packages/plugin-resource-manager-administration/src/ResourceManagerSettings.tsx
+++ b/webapp/packages/plugin-resource-manager-administration/src/ResourceManagerSettings.tsx
@@ -9,7 +9,7 @@
 import { observer } from 'mobx-react-lite';
 import styled from 'reshadow';
 
-import { BASE_CONTAINERS_STYLES, Group, GroupTitle, PlaceholderComponent, Switch } from '@cloudbeaver/core-blocks';
+import { BASE_CONTAINERS_STYLES, GroupTitle, PlaceholderComponent, Switch } from '@cloudbeaver/core-blocks';
 import { useTranslate } from '@cloudbeaver/core-localization';
 import type { IConfigurationPlaceholderProps } from '@cloudbeaver/plugin-administration';
 
@@ -18,7 +18,7 @@ export const ResourceManagerSettings: PlaceholderComponent<IConfigurationPlaceho
     const translate = useTranslate();
 
     return styled(BASE_CONTAINERS_STYLES)(
-      <Group key='resourceManager' gap>
+      <>
         <GroupTitle>{translate('plugin_resource_manager_title')}</GroupTitle>
         <Switch
           name='resourceManagerEnabled'
@@ -30,6 +30,6 @@ export const ResourceManagerSettings: PlaceholderComponent<IConfigurationPlaceho
         >
           {translate('plugin_resource_manager_administration_settings_enable')}
         </Switch>
-      </Group>
+      </>
     );
   });
\ No newline at end of file
diff --git a/webapp/packages/plugin-resource-manager/src/ResourceManagerService.ts b/webapp/packages/plugin-resource-manager/src/ResourceManagerService.ts
index 7870cd264a..69bdf2a5f2 100644
--- a/webapp/packages/plugin-resource-manager/src/ResourceManagerService.ts
+++ b/webapp/packages/plugin-resource-manager/src/ResourceManagerService.ts
@@ -10,20 +10,19 @@ import { computed, makeObservable, observable } from 'mobx';
 
 import { AuthInfoService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
-
-import { ResourceManagerSettingsService } from './ResourceManagerSettingsService';
+import { ServerConfigResource } from '@cloudbeaver/core-root';
 
 @injectable()
 export class ResourceManagerService {
   get enabled() {
-    return !this.resourceManagerSettingsService.settings.getValue('disabled') && !!this.authInfoService.userInfo;
+    return this.serverConfigResource.resourceManagerEnabled && !!this.authInfoService.userInfo;
   }
 
   panelEnabled: boolean;
 
   constructor(
-    private readonly resourceManagerSettingsService: ResourceManagerSettingsService,
     private readonly authInfoService: AuthInfoService,
+    private readonly serverConfigResource: ServerConfigResource
   ) {
     this.togglePanel = this.togglePanel.bind(this);