Merge branch 'devel' into CB-5440-merge-into-internal-db

README.md

@@ -57,5 +57,5 @@ You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io
 As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
 
 [We are happy to reward](https://dbeaver.com/help-dbeaver/) our most active contributors every major sprint.
-The most significant contribution to our code for the major release 24.2.0 was made by:
-1. [matthieukhl](https://github.com/matthieukhl)
+The most significant contribution to our code for the major release 24.3.0 was made by:
+1. [cashlifei](https://github.com/cashlifei)

osgi-app.properties

@@ -5,7 +5,8 @@ featuresPaths=\
 bundlesPaths=\
   dbeaver-common/modules;\
   dbeaver/plugins;\
-  cloudbeaver/server/bundles;
+  cloudbeaver/server/bundles;\
+  dbeaver-jdbc-libsql
 testLibraries=\
   org.junit;\
   org.mockito.mockito-core;\

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java

@@ -511,7 +511,7 @@ public void deleteResource(@NotNull String projectId, @NotNull String resourcePa
                     log.warn("Failed to remove resources properties", e);
                 }
                 try {
-                    if (targetPath.toFile().isDirectory()) {
+                    if (Files.isDirectory(targetPath)) {
                         IOUtils.deleteDirectory(targetPath);
                     } else {
                         Files.delete(targetPath);

webapp/packages/core-blocks/src/StatusMessage.tsx

@@ -39,13 +39,18 @@ export const StatusMessage = observer<Props>(function StatusMessage({
   const errorDetails = useErrorDetails(exception);
   const isError = type === ENotificationType.Error || exception !== null;
 
-  if (Array.isArray(message)) {
-    message = message.map(m => translate(m)).join(', ');
-  } else if (message !== null) {
-    message = translate(message);
+  function translateMessage(message: string | string[] | null | undefined) {
+    if (Array.isArray(message)) {
+      message = message.map(m => translate(m)).join(', ');
+    } else if (message !== null) {
+      message = translate(message);
+    }
+
+    return message;
   }
 
-  message = message ?? errorDetails.message;
+  message = translateMessage(message) || translateMessage(errorDetails.message);
+
   let icon = '/icons/info_icon.svg';
 
   if (isError) {

webapp/packages/core-connections/src/ConnectionInfoResource.ts

@@ -421,20 +421,18 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
   }
 
   async changeConnectionView(key: IConnectionInfoParams, settings: NavigatorViewSettings): Promise<Connection> {
-    await this.performUpdate(key, [], async () => {
-      const connectionNavigatorViewSettings = this.get(key)?.navigatorSettings || DEFAULT_NAVIGATOR_VIEW_SETTINGS;
-      const { connection } = await this.graphQLService.sdk.setConnectionNavigatorSettings({
-        connectionId: key.connectionId,
-        projectId: key.projectId,
-        settings: { ...connectionNavigatorViewSettings, ...settings },
-        ...this.getDefaultIncludes(),
-        ...this.getIncludesMap(key),
-      });
-
-      this.set(createConnectionParam(connection), connection);
-      this.onDataOutdated.execute(key);
+    const connectionNavigatorViewSettings = this.get(key)?.navigatorSettings || DEFAULT_NAVIGATOR_VIEW_SETTINGS;
+    const { connection } = await this.graphQLService.sdk.setConnectionNavigatorSettings({
+      connectionId: key.connectionId,
+      projectId: key.projectId,
+      settings: { ...connectionNavigatorViewSettings, ...settings },
+      ...this.getDefaultIncludes(),
+      ...this.getIncludesMap(key),
     });
 
+    this.set(createConnectionParam(connection), connection);
+    this.onDataOutdated.execute(key);
+
     return this.get(key)!;
   }
 

webapp/packages/core-ui/src/Form/FormPart.ts

@@ -88,6 +88,7 @@ export abstract class FormPart<TPartState, TFormState = any> implements IFormPar
     if (this.loading) {
       return;
     }
+
     this.loading = true;
 
     try {

webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx

@@ -26,7 +26,7 @@ export const GrantedUsersTableInnerHeader = observer<Props>(function GrantedUser
       <TableColumnHeader min />
       <TableColumnHeader>{translate('administration_teams_team_granted_users_user_id')}</TableColumnHeader>
       {showUserTeamRole && (
-        <TableColumnHeader title={translate('plugin_authentication_administration_team_user_team_role_supervisor_description')}>
+        <TableColumnHeader title={translate('plugin_authentication_administration_team_user_team_role_supervisor_description')} flex centerContent>
           {translate('plugin_authentication_administration_team_user_team_role_supervisor')}
         </TableColumnHeader>
       )}

webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsersTableItem.tsx

@@ -49,7 +49,7 @@ export const GrantedUsersTableItem = observer<Props>(function GrantedUsersTableI
       </TableColumnValue>
       <TableColumnValue>{name}</TableColumnValue>
       {teamRoles.length > 0 && (
-        <TableColumnValue title={translate('plugin_authentication_administration_team_user_team_role_supervisor_description')}>
+        <TableColumnValue title={translate('plugin_authentication_administration_team_user_team_role_supervisor_description')} centerContent flex>
           <Checkbox
             checked={teamRole === USER_TEAM_ROLE_SUPERVISOR}
             onChange={value => onTeamRoleAssign(id, value ? USER_TEAM_ROLE_SUPERVISOR : null)}