Merge branch 'devel' into dbeaver/pro#7465/refactor/context-menu-ariakit

Author: Wroud

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebConnectionConfigInputHandler.java

@@ -18,6 +18,7 @@
 
 import io.cloudbeaver.model.WebConnectionConfig;
 import io.cloudbeaver.model.app.WebAppConfiguration;
+import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.utils.ServletAppUtils;
 import io.cloudbeaver.utils.WebDataSourceUtils;
 import org.jkiss.code.NotNull;
@@ -32,8 +33,10 @@ public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C ex
     private static final Log log = Log.getLog(WebConnectionConfigInputHandler.class);
     protected final T input;
     protected final DBPDataSourceRegistry registry;
+    protected final WebSession webSession;
 
-    public WebConnectionConfigInputHandler(@NotNull DBPDataSourceRegistry registry, T configInput) {
+    public WebConnectionConfigInputHandler(@NotNull WebSession webSession, @NotNull DBPDataSourceRegistry registry, T configInput) {
+        this.webSession = webSession;
         this.registry = registry;
         this.input = configInput;
     }
@@ -52,6 +55,7 @@ public C createDataSourceContainer() throws DBWebException {
         }
 
         WebDataSourceUtils.saveAuthProperties(
+            webSession.getProgressMonitor(),
             newDataSource,
             newDataSource.getConnectionConfiguration(),
             input.getCredentials(),
@@ -81,6 +85,7 @@ public void updateDataSource(@NotNull C dataSource) throws DBWebException {
             input
         );
         WebDataSourceUtils.saveAuthProperties(
+            webSession.getProgressMonitor(),
             dataSource,
             dataSource.getConnectionConfiguration(),
             input.getCredentials(),

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionProjectImpl.java

@@ -244,6 +244,7 @@ public synchronized boolean updateProjectDataSources(@NotNull WSDataSourceEvent
         return sendDataSourceUpdatedEvent;
     }
 
+    // TODO: load project settings on project load
     public void refreshProjectSettings() throws DBException {
         if (webSession.getUser() == null) {
             projectSettings.clear();
@@ -359,7 +360,7 @@ public WebConnectionConfig getConnectionConfigInput(@Nullable Map<String, Object
 
     @NotNull
     protected WebConnectionConfigInputHandler getInputConfigHandler(@NotNull WebConnectionConfig configInput) {
-        return new WebConnectionConfigInputHandler<>(getDataSourceRegistry(), configInput);
+        return new WebConnectionConfigInputHandler<>(webSession, getDataSourceRegistry(), configInput);
     }
 
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java

@@ -324,7 +324,6 @@ private WebSessionProjectImpl createWebProject(RMProject project) throws DBExcep
         } else {
             sessionProject = createSessionProject(project);
         }
-        sessionProject.refreshProjectSettings();
         // do not load data sources for anonymous project
         if (project.getType() == RMProjectType.USER && userContext.getUser() == null) {
             sessionProject.setInMemory(true);
@@ -841,7 +840,7 @@ public boolean provideAuthParameters(
             // uncommented because we had the problem with non-native auth models
             // (for example, can't connect to DynamoDB if credentials are not saved)
             DBAAuthCredentials credentials = configuration.getAuthModel().loadCredentials(dataSourceContainer, configuration);
-            WebDataSourceUtils.updateCredentialsFromProperties(credentials, configuration.getAuthProperties());
+            WebDataSourceUtils.updateCredentialsFromProperties(this.progressMonitor, credentials, configuration.getAuthProperties());
 
             configuration.getAuthModel().provideCredentials(dataSourceContainer, configuration, credentials);
         } catch (DBException e) {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebDataSourceUtils.java

@@ -16,10 +16,6 @@
  */
 package io.cloudbeaver.utils;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.InstanceCreator;
-import com.google.gson.Strictness;
 import io.cloudbeaver.DBWConstants;
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.WebSessionProjectImpl;
@@ -34,7 +30,6 @@
 import org.jkiss.dbeaver.model.DBConstants;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.access.DBAAuthCredentials;
-import org.jkiss.dbeaver.model.access.DBAAuthCredentialsWithComplexProperties;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
@@ -43,7 +38,9 @@
 import org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNativeCredentials;
 import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
 import org.jkiss.dbeaver.model.net.ssh.SSHConstants;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceDisconnectEvent;
+import org.jkiss.dbeaver.registry.DataSourceUtils;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -211,31 +208,30 @@ public static WebConnectionInfo getWebConnectionInfo(
         return webSession.getAccessibleProjectById(projectId).getWebConnectionInfo(connectionId);
     }
 
-
-    public static void updateCredentialsFromProperties(@NotNull DBAAuthCredentials credentials, @NotNull Map<String, ?> properties) {
-        InstanceCreator<DBAAuthCredentials> credTypeAdapter = type -> credentials;
-        Gson credGson = new GsonBuilder()
-            .setStrictness(Strictness.LENIENT)
-            .registerTypeAdapter(credentials.getClass(), credTypeAdapter)
-            .create();
-
-        if (credentials instanceof DBAAuthCredentialsWithComplexProperties complexProperties) {
-            complexProperties.updateCredentialsFromComplexProperties(properties);
+    public static void updateCredentialsFromProperties(
+        @NotNull DBRProgressMonitor progressMonitor,
+        @NotNull DBAAuthCredentials credentials,
+        @Nullable Map<String, ?> properties
+    ) {
+        if (properties == null) {
+            return;
         }
-        credGson.fromJson(credGson.toJsonTree(properties), credentials.getClass());
+        DataSourceUtils.updateCredentialsFromProperties(progressMonitor, credentials, properties);
     }
 
     public static void saveAuthProperties(
+        @NotNull DBRProgressMonitor progressMonitor,
         @NotNull DBPDataSourceContainer dataSourceContainer,
         @NotNull DBPConnectionConfiguration configuration,
         @Nullable Map<String, Object> authProperties,
         boolean saveCredentials,
         boolean sharedCredentials
     ) {
-        saveAuthProperties(dataSourceContainer, configuration, authProperties, saveCredentials, sharedCredentials, false);
+        saveAuthProperties(progressMonitor, dataSourceContainer, configuration, authProperties, saveCredentials, sharedCredentials, false);
     }
 
     public static void saveAuthProperties(
+        @NotNull DBRProgressMonitor progressMonitor,
         @NotNull DBPDataSourceContainer dataSourceContainer,
         @NotNull DBPConnectionConfiguration configuration,
         @Nullable Map<String, Object> authProperties,
@@ -271,7 +267,7 @@ public static void saveAuthProperties(
                 configuration.setAuthProperties(currentAuthProps);
             }
             if (!authProperties.isEmpty()) {
-                updateCredentialsFromProperties(credentials, authProperties);
+                updateCredentialsFromProperties(progressMonitor, credentials, authProperties);
             }
 
             configuration.getAuthModel().saveCredentials(dataSourceContainer, configuration, credentials);

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java

@@ -373,6 +373,7 @@ public WebConnectionInfo initConnection(
         if (saveCredentials) {
             // Save all passed credentials in the datasource container
             WebDataSourceUtils.saveAuthProperties(
+                webSession.getProgressMonitor(),
                 dataSourceContainer,
                 dataSourceContainer.getConnectionConfiguration(),
                 authProperties,
@@ -529,6 +530,7 @@ public WebConnectionInfo testConnection(
                 }
             }
             WebDataSourceUtils.saveAuthProperties(
+                webSession.getProgressMonitor(),
                 testDataSource,
                 testDataSource.getConnectionConfiguration(),
                 configInput.getCredentials(),

server/bundles/io.cloudbeaver.service.ldap.auth/src/io/cloudbeaver/service/ldap/auth/LdapAuthProvider.java

@@ -533,7 +533,7 @@ private String getUserDN(LdapSettings ldapSettings, String displayName) {
     @NotNull
     private List<String> getGroupForMember(String fullDN, LdapSettings ldapSettings, Map<String, Object> authParameters) {
         DirContext context = null;
-        List<String> result = new ArrayList<>();
+        Set<String> result = new LinkedHashSet<>();
         try {
             Map<String, String> environment = creteAuthEnvironment(ldapSettings);
             if (CommonUtils.isEmpty(ldapSettings.getBindUserDN())) {
@@ -570,7 +570,7 @@ private List<String> getGroupForMember(String fullDN, LdapSettings ldapSettings,
                 log.error("Close resource of ldap group search failed", e);
             }
         }
-        return result;
+        return new ArrayList<>(result);
     }
 
     private List<String> findGroupsByMemberOfAttribute(String fullDN, DirContext context) throws NamingException {

webapp/common-react/@dbeaver/ui-kit/src/ColorPicker/ColorGrid.tsx

@@ -10,7 +10,7 @@ import { ColorIndicator } from './ColorIndicator.js';
 import { type UseColorPaletteResult } from './useColorPalette.js';
 import { memo } from 'react';
 import { useTranslate } from '@dbeaver/react-translate';
-import { Command } from '../Command.js';
+import { Command } from '../Command/Command.js';
 
 interface ColorGridProps {
   colorPalette: UseColorPaletteResult;

webapp/common-react/@dbeaver/ui-kit/src/Command/Command.tsx

@@ -0,0 +1,14 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { Command as AriakitCommand, type CommandProps as AriakitCommandProps } from '@ariakit/react';
+
+export interface CommandProps extends AriakitCommandProps {}
+
+export function Command({ ...props }: CommandProps): React.ReactElement {
+  return <AriakitCommand {...props} />;
+}

…on-react/@dbeaver/ui-kit/src/Command.tsx …act/@dbeaver/ui-kit/src/Command/index.tswebapp/common-react/@dbeaver/ui-kit/src/Command.tsx renamed to webapp/common-react/@dbeaver/ui-kit/src/Command/index.ts webapp/common-react/@dbeaver/ui-kit/src/Command.tsx renamed to webapp/common-react/@dbeaver/ui-kit/src/Command/index.ts

@@ -6,4 +6,4 @@
  * you may not use this file except in compliance with the License.
  */
 
-export { Command } from '@ariakit/react';
+export { Command, type CommandProps } from './Command.js';

webapp/common-react/@dbeaver/ui-kit/src/index.ts

@@ -38,6 +38,7 @@ export {
   type SelectItemProps,
 } from './Select/Select.js';
 export * from './Combobox/Combobox.js';
+export * from './Command/Command.js';
 export { SelectField, type SelectFieldProps, type SelectItem } from './Select/SelectField.js';
 export { Spinner, type SpinnerProps } from './Spinner/Spinner.js';
 export { Radio, RadioGroup, useRadioContext, useRadioStore, type RadioProviderProps, type RadioProps, type RadioGroupProps } from './Radio/index.js';