CB-5060 add beta features config param (#2599)

* CB-5109 add beta features config param * CB-5109 rename param * CB-5060 feat: disable beta features * CB-5109 add param to config file --------- Co-authored-by: Alexey <[email protected]> Co-authored-by: kseniaguzeeva <[email protected]>
dbeaver · May 14, 2024 · 833dae5 · 833dae5
1 parent 12bc212
commit 833dae5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 0 deletions.
diff --git a/config/sample-databases/DefaultConfiguration/cloudbeaver.conf b/config/sample-databases/DefaultConfiguration/cloudbeaver.conf
@@ -94,6 +94,9 @@
             "h2:h2_embedded",
             "h2:h2_embedded_v2",
             "clickhouse:yandex_clickhouse"
+        ],
+        disabledBetaFeatures: [
+
         ]
 
     }

diff --git a/config/sample-databases/SQLiteConfiguration/cloudbeaver.conf b/config/sample-databases/SQLiteConfiguration/cloudbeaver.conf
@@ -89,6 +89,9 @@
             "h2:h2_embedded",
             "h2:h2_embedded_v2",
             "clickhouse:yandex_clickhouse"
+        ],
+        disabledBetaFeatures: [
+
         ]
 
     }

diff --git a/...er/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java b/...er/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java
@@ -33,11 +33,14 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
     protected boolean resourceManagerEnabled;
     protected boolean showReadOnlyConnectionInfo;
     protected String[] enabledFeatures;
+    protected String[] disabledBetaFeatures;
+
 
     public BaseWebAppConfiguration() {
         this.plugins = new LinkedHashMap<>();
         this.resourceManagerEnabled = true;
         this.enabledFeatures = null;
+        this.disabledBetaFeatures = new String[0];
         this.showReadOnlyConnectionInfo = false;
     }
 
@@ -46,6 +49,7 @@ public BaseWebAppConfiguration(BaseWebAppConfiguration src) {
         this.defaultUserTeam = src.defaultUserTeam;
         this.resourceManagerEnabled = src.resourceManagerEnabled;
         this.enabledFeatures = src.enabledFeatures;
+        this.disabledBetaFeatures = src.disabledBetaFeatures;
         this.showReadOnlyConnectionInfo = src.showReadOnlyConnectionInfo;
     }
 
@@ -104,4 +108,8 @@ public void setEnabledFeatures(String[] enabledFeatures) {
     public boolean isShowReadOnlyConnectionInfo() {
         return showReadOnlyConnectionInfo;
     }
+
+    public String[] getDisabledBetaFeatures() {
+        return disabledBetaFeatures;
+    }
 }
diff --git a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
@@ -153,6 +153,7 @@ type ServerConfig {
     distributed: Boolean!
 
     enabledFeatures: [ID!]!
+    disabledBetaFeatures: [ID!] @since(version: "24.0.5")
     enabledAuthProviders: [ID!]!
     supportedLanguages: [ ServerLanguage! ]!
     services: [ WebServiceConfig ]

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java
@@ -21,6 +21,7 @@
 import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.server.CBPlatform;
 import io.cloudbeaver.service.security.PasswordPolicyConfiguration;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings;
 import org.jkiss.dbeaver.registry.language.PlatformLanguageDescriptor;
@@ -155,6 +156,12 @@ public String[] getEnabledFeatures() {
         return application.getAppConfiguration().getEnabledFeatures();
     }
 
+    @Property
+    @Nullable
+    public String[] getDisabledBetaFeatures() {
+        return application.getAppConfiguration().getDisabledBetaFeatures();
+    }
+
     @Property
     public String[] getEnabledAuthProviders() {
         return application.getAppConfiguration().getEnabledAuthProviders();

diff --git a/webapp/packages/core-root/src/ServerConfigResource.ts b/webapp/packages/core-root/src/ServerConfigResource.ts
@@ -157,6 +157,10 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
     return this.update.resourceManagerEnabled ?? this.data?.resourceManagerEnabled ?? false;
   }
 
+  isBetaFeatureDisabled(feature: string): boolean {
+    return this.data?.disabledBetaFeatures?.includes(feature) || false;
+  }
+
   isFeatureEnabled(feature: string, serverSide = false): boolean {
     if (serverSide) {
       return this.data?.enabledFeatures.includes(feature) || false;

diff --git a/webapp/packages/core-sdk/src/queries/session/serverConfig.gql b/webapp/packages/core-sdk/src/queries/session/serverConfig.gql
@@ -30,6 +30,7 @@ query serverConfig {
     distributed
 
     enabledFeatures
+    disabledBetaFeatures
     enabledAuthProviders
     supportedLanguages {
       isoCode