Merge branch 'devel' into CB-4382-anonymous-access-restricted-error

dbeaver · Jan 17, 2024 · 81e7c75 · 81e7c75
2 parents a02d5f1 + d8f197e
commit 81e7c75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...ndles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java b/...ndles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
@@ -1155,6 +1155,11 @@ public static Builder builder(
         return new Builder(workspace, credentialsProvider, smControllerSupplier);
     }
 
+    @Override
+    public String ping() {
+        return "pong (RM)";
+    }
+
     public static final class Builder {
         private final SMCredentialsProvider credentialsProvider;
         private final Supplier<SMController> smController;

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
@@ -515,6 +515,7 @@ private void initializeSecurityController() throws DBException {
     @Nullable
     @Override
     protected Path loadServerConfiguration() throws DBException {
+        initHomeFolder();
         Path path = super.loadServerConfiguration();
 
 
@@ -548,8 +549,7 @@ private void parseConfiguration(File configFile) throws DBException {
     }
 
     protected void parseConfiguration(Map<String, Object> configProps) throws DBException {
-        String homeFolder = initHomeFolder();
-
+        Path homeFolder = getHomeDirectory();
         CBAppConfig prevConfig = new CBAppConfig(appConfiguration);
         Gson gson = getGson();
         try {
@@ -602,7 +602,7 @@ protected void parseConfiguration(Map<String, Object> configProps) throws DBExce
 
             databaseConfiguration.putAll(JSONUtils.getObject(serverConfig, CBConstants.PARAM_DB_CONFIGURATION));
 
-            readProductConfiguration(serverConfig, gson, homeFolder);
+            readProductConfiguration(serverConfig, gson, homeFolder.toString());
 
             String staticContentsFile = JSONUtils.getString(serverConfig, CBConstants.PARAM_STATIC_CONTENT);
             if (!CommonUtils.isEmpty(staticContentsFile)) {

diff --git a/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.m.css b/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.m.css
@@ -18,4 +18,5 @@
   margin: 0;
   text-overflow: ellipsis;
   overflow: hidden;
-}
+  white-space: nowrap;
+}