CB-5574 adds secret manager depending on the setting

dbeaver · Dec 25, 2024 · 1790f5f · 1790f5f
1 parent fb70b44
commit 1790f5f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/webapp/packages/core-root/src/ServerConfigResource.ts b/webapp/packages/core-root/src/ServerConfigResource.ts
@@ -100,6 +100,10 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
     return this.data?.resourceManagerEnabled ?? false;
   }
 
+  get secretManagerEnabled() {
+    return this.data?.secretManagerEnabled ?? false;
+  }
+
   isBetaFeatureDisabled(feature: string): boolean {
     return this.data?.disabledBetaFeatures?.includes(feature) || false;
   }

diff --git a/webapp/packages/core-root/src/__custom_mocks__/data/defaultServerConfig.ts b/webapp/packages/core-root/src/__custom_mocks__/data/defaultServerConfig.ts
@@ -28,6 +28,7 @@ export const defaultServerConfig: (productConfiguration?: Record<string, any>) =
     anonymousAccessEnabled: true,
     adminCredentialsSaveEnabled: true,
     publicCredentialsSaveEnabled: true,
+    secretManagerEnabled: true,
     resourceManagerEnabled: true,
     licenseRequired: false,
     licenseValid: false,

diff --git a/webapp/packages/core-sdk/src/queries/fragments/ServerConfig/ServerConfig.gql b/webapp/packages/core-sdk/src/queries/fragments/ServerConfig/ServerConfig.gql
@@ -17,6 +17,7 @@ fragment ServerConfig on ServerConfig {
   publicCredentialsSaveEnabled
 
   resourceManagerEnabled
+  secretManagerEnabled
 
   configurationMode
   developmentMode

diff --git a/...stration/src/ConfigurationWizard/ServerConfiguration/IServerConfigurationFormPartState.ts b/...stration/src/ConfigurationWizard/ServerConfiguration/IServerConfigurationFormPartState.ts
@@ -19,6 +19,7 @@ const ServerConfigurationFormPartStateConfigSchema = schema.object({
   enabledFeatures: schema.array(schema.string()).optional(),
   publicCredentialsSaveEnabled: schema.boolean().optional(),
   resourceManagerEnabled: schema.boolean().optional(),
+  secretManagerEnabled: schema.boolean().optional(),
   serverName: schema.string().optional(),
   serverURL: schema.string().optional(),
   sessionExpireTime: schema.number().optional(),

diff --git a/...administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationFormPart.ts b/...administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationFormPart.ts
@@ -29,6 +29,7 @@ function DEFAULT_STATE_GETTER(): IServerConfigurationFormPartState {
       enabledFeatures: [],
       publicCredentialsSaveEnabled: false,
       resourceManagerEnabled: false,
+      secretManagerEnabled: false,
       serverName: '',
       serverURL: '',
       sessionExpireTime: MIN_SESSION_EXPIRE_TIME * 1000 * 60,
@@ -147,6 +148,7 @@ export class ServerConfigurationFormPart extends FormPart<IServerConfigurationFo
         anonymousAccessEnabled: config?.anonymousAccessEnabled ?? false,
         enabledFeatures: config?.enabledFeatures ? [...config.enabledFeatures] : [],
         resourceManagerEnabled: config?.resourceManagerEnabled ?? false,
+        secretManagerEnabled: config?.secretManagerEnabled ?? false,
       },
       navigatorConfig: { ...this.state.navigatorConfig, ...defaultNavigatorSettings },
     });