From a23c2c2a55884c01d66895803be81e28ed589d65 Mon Sep 17 00:00:00 2001 From: Sychev Andrey <44414066+SychevAndrey@users.noreply.github.com> Date: Tue, 12 Nov 2024 18:27:15 +0100 Subject: [PATCH 1/5] CB-5775 refactor: make default group text aligned with other tabs (#3064) * CB-5775 refactor: make default group text aligned with other tabs * CB-5775: return accidentally removed gap prop * CB-5775 refactor: return TextPlaceholder back * CB-5775 refactor: make style important --------- Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> --- .../Teams/GrantedUsers/GrantedUsers.module.css | 4 ++++ .../Users/Teams/GrantedUsers/GrantedUsers.tsx | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.module.css b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.module.css index 293ac777b5..fbccc496b0 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.module.css +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.module.css @@ -17,6 +17,10 @@ overflow: auto !important; } +.placeholder { + margin: 0 !important; +} + .loader { z-index: 2; } diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.tsx index 496c6fbf3b..122bff1dac 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUsers.tsx @@ -55,9 +55,11 @@ export const GrantedUsers: TabContainerPanelComponent = observer if (isDefaultTeam) { return ( - - - {translate('plugin_authentication_administration_team_default_users_tooltip')} + + + + {translate('plugin_authentication_administration_team_default_users_tooltip')} + ); @@ -66,10 +68,12 @@ export const GrantedUsers: TabContainerPanelComponent = observer return ( {() => ( - + {!users.resource.values.length ? ( - - {translate('administration_teams_team_granted_users_empty')} + + + {translate('administration_teams_team_granted_users_empty')} + ) : ( <> From cee8f00b9e5058a159fda9997adffb8a6fcd0689 Mon Sep 17 00:00:00 2001 From: Sychev Andrey <44414066+SychevAndrey@users.noreply.github.com> Date: Tue, 12 Nov 2024 18:33:22 +0100 Subject: [PATCH 2/5] CB-5016 add disable import option to global config (#3058) * CB-5016 add disable import option to global config * CB-5016 refactor: move logic from DataViewerSettingService to DataImportSettingsService * CB-5016 refactor: simplify * CB-5016 refactor: move disable import locale token to data-import-plugin * CB-5016 refactor: ru locale --------- Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com> Co-authored-by: alex <48489896+devnaumov@users.noreply.github.com> --- .../src/DataImportSettingsService.ts | 21 +++++++++++++++++-- .../plugin-data-import/src/locales/en.ts | 2 ++ .../plugin-data-import/src/locales/fr.ts | 2 ++ .../plugin-data-import/src/locales/it.ts | 2 ++ .../plugin-data-import/src/locales/ru.ts | 2 ++ .../plugin-data-import/src/locales/zh.ts | 2 ++ 6 files changed, 29 insertions(+), 2 deletions(-) diff --git a/webapp/packages/plugin-data-import/src/DataImportSettingsService.ts b/webapp/packages/plugin-data-import/src/DataImportSettingsService.ts index 3ddf7579d7..171cd2a08e 100644 --- a/webapp/packages/plugin-data-import/src/DataImportSettingsService.ts +++ b/webapp/packages/plugin-data-import/src/DataImportSettingsService.ts @@ -6,8 +6,9 @@ * you may not use this file except in compliance with the License. */ import { injectable } from '@cloudbeaver/core-di'; -import { SettingsProvider, SettingsProviderService } from '@cloudbeaver/core-settings'; +import { ESettingsValueType, SettingsManagerService, SettingsProvider, SettingsProviderService } from '@cloudbeaver/core-settings'; import { schema, schemaExtra } from '@cloudbeaver/core-utils'; +import { DATA_EDITOR_SETTINGS_GROUP } from '@cloudbeaver/plugin-data-viewer'; const defaultSettings = schema.object({ 'plugin.data-import.disabled': schemaExtra.stringedBoolean().default(false), @@ -22,7 +23,23 @@ export class DataImportSettingsService { } readonly settings: SettingsProvider; - constructor(private readonly settingsProviderService: SettingsProviderService) { + constructor( + private readonly settingsProviderService: SettingsProviderService, + private readonly settingsManagerService: SettingsManagerService, + ) { this.settings = this.settingsProviderService.createSettings(defaultSettings); + + this.settingsManagerService.registerSettings(this.settings, () => [ + { + group: DATA_EDITOR_SETTINGS_GROUP, + key: 'plugin.data-import.disabled', + type: ESettingsValueType.Checkbox, + name: 'plugin_data_import_disable_data_import_name', + description: 'plugin_data_import_disable_data_import_description', + access: { + scope: ['server'], + }, + }, + ]); } } diff --git a/webapp/packages/plugin-data-import/src/locales/en.ts b/webapp/packages/plugin-data-import/src/locales/en.ts index 4708ccda90..ef8f25470b 100644 --- a/webapp/packages/plugin-data-import/src/locales/en.ts +++ b/webapp/packages/plugin-data-import/src/locales/en.ts @@ -11,4 +11,6 @@ export default [ ['plugin_data_import_process_success', 'Data imported successfully'], ['plugin_data_import_process_fail', 'Data import failed'], ['plugin_data_import_process_file_processing_step_message', 'File uploaded, processing...'], + ['plugin_data_import_disable_data_import_name', 'Disable Import'], + ['plugin_data_import_disable_data_import_description', 'Disable importing of data in Data Viewer for non-admin users'], ]; diff --git a/webapp/packages/plugin-data-import/src/locales/fr.ts b/webapp/packages/plugin-data-import/src/locales/fr.ts index de5167d416..40951db23e 100644 --- a/webapp/packages/plugin-data-import/src/locales/fr.ts +++ b/webapp/packages/plugin-data-import/src/locales/fr.ts @@ -11,4 +11,6 @@ export default [ ['plugin_data_import_process_success', 'Données importées avec succès'], ['plugin_data_import_process_fail', "Échec de l'importation des données"], ['plugin_data_import_process_file_processing_step_message', 'Fichier téléchargé, en cours de traitement...'], + ['plugin_data_import_disable_data_import_name', 'Disable Import'], + ['plugin_data_import_disable_data_import_description', 'Disable importing of data in Data Viewer for non-admin users'], ]; diff --git a/webapp/packages/plugin-data-import/src/locales/it.ts b/webapp/packages/plugin-data-import/src/locales/it.ts index 4708ccda90..ef8f25470b 100644 --- a/webapp/packages/plugin-data-import/src/locales/it.ts +++ b/webapp/packages/plugin-data-import/src/locales/it.ts @@ -11,4 +11,6 @@ export default [ ['plugin_data_import_process_success', 'Data imported successfully'], ['plugin_data_import_process_fail', 'Data import failed'], ['plugin_data_import_process_file_processing_step_message', 'File uploaded, processing...'], + ['plugin_data_import_disable_data_import_name', 'Disable Import'], + ['plugin_data_import_disable_data_import_description', 'Disable importing of data in Data Viewer for non-admin users'], ]; diff --git a/webapp/packages/plugin-data-import/src/locales/ru.ts b/webapp/packages/plugin-data-import/src/locales/ru.ts index 58f75e325e..6037ad8f1b 100644 --- a/webapp/packages/plugin-data-import/src/locales/ru.ts +++ b/webapp/packages/plugin-data-import/src/locales/ru.ts @@ -11,4 +11,6 @@ export default [ ['plugin_data_import_process_success', 'Данные успешно импортированы'], ['plugin_data_import_process_fail', 'Ошибка импорта данных'], ['plugin_data_import_process_file_processing_step_message', 'Файл загружен, обработка...'], + ['plugin_data_import_disable_data_import_name', 'Отключить импорт данных'], + ['plugin_data_import_disable_data_import_description', 'Отключить импорт данных для пользователей без прав администратора'], ]; diff --git a/webapp/packages/plugin-data-import/src/locales/zh.ts b/webapp/packages/plugin-data-import/src/locales/zh.ts index d10de0976a..087fdbf4e7 100644 --- a/webapp/packages/plugin-data-import/src/locales/zh.ts +++ b/webapp/packages/plugin-data-import/src/locales/zh.ts @@ -11,4 +11,6 @@ export default [ ['plugin_data_import_process_success', '数据导入成功'], ['plugin_data_import_process_fail', '数据导入失败'], ['plugin_data_import_process_file_processing_step_message', '文件已上传，正在处理...'], + ['plugin_data_import_disable_data_import_name', 'Disable Import'], + ['plugin_data_import_disable_data_import_description', 'Disable importing of data in Data Viewer for non-admin users'], ]; From f31be24a49a059672cf4063216304415817be1d4 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Tue, 12 Nov 2024 21:56:10 +0100 Subject: [PATCH 3/5] dbeaver/pro#3641 24.3.0 version bump --- server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.model/pom.xml | 2 +- server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.product.ce/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml | 2 +- server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.server/pom.xml | 2 +- .../bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.admin/pom.xml | 2 +- .../bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.auth/pom.xml | 2 +- .../io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.data.transfer/pom.xml | 2 +- server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.fs/pom.xml | 2 +- .../io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.metadata/pom.xml | 2 +- .../io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.rm.nio/pom.xml | 2 +- server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.rm/pom.xml | 2 +- .../io.cloudbeaver.service.security/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.service.security/pom.xml | 2 +- server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF | 4 ++-- server/bundles/io.cloudbeaver.slf4j/pom.xml | 2 +- server/features/io.cloudbeaver.ce.drivers.feature/feature.xml | 2 +- server/features/io.cloudbeaver.ce.drivers.feature/pom.xml | 2 +- server/features/io.cloudbeaver.product.ce.feature/feature.xml | 2 +- server/features/io.cloudbeaver.product.ce.feature/pom.xml | 2 +- server/features/io.cloudbeaver.server.feature/feature.xml | 2 +- server/features/io.cloudbeaver.server.feature/pom.xml | 2 +- server/features/io.cloudbeaver.ws.feature/feature.xml | 2 +- server/features/io.cloudbeaver.ws.feature/pom.xml | 2 +- server/pom.xml | 2 +- server/product/web-server/CloudbeaverServer.product | 2 +- server/product/web-server/pom.xml | 2 +- 37 files changed, 50 insertions(+), 50 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF index 66edf9bbb2..5f998bc37e 100644 --- a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Model Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true -Bundle-Version: 1.0.65.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.66.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.model/pom.xml b/server/bundles/io.cloudbeaver.model/pom.xml index 0832142631..cd0f7854f8 100644 --- a/server/bundles/io.cloudbeaver.model/pom.xml +++ b/server/bundles/io.cloudbeaver.model/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.model - 1.0.65-SNAPSHOT + 1.0.66-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF index eab0fb4e5a..3cc02705d6 100644 --- a/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Community Product Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true -Bundle-Version: 24.2.5.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 24.3.0.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.product.ce/pom.xml b/server/bundles/io.cloudbeaver.product.ce/pom.xml index 2f72ef816c..19029a80e4 100644 --- a/server/bundles/io.cloudbeaver.product.ce/pom.xml +++ b/server/bundles/io.cloudbeaver.product.ce/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.product.ce - 24.2.5-SNAPSHOT + 24.3.0-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF index d543d9254a..31f399616b 100644 --- a/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Base JDBC drivers Bundle-SymbolicName: io.cloudbeaver.resources.drivers.base;singleton:=true -Bundle-Version: 1.0.110.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.111.qualifier +Bundle-Release-Date: 20241202 Bundle-Vendor: DBeaver Corp Bundle-ActivationPolicy: lazy Automatic-Module-Name: io.cloudbeaver.resources.drivers.base diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml index da070a045f..d327cd569d 100644 --- a/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml +++ b/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml @@ -9,6 +9,6 @@ ../ io.cloudbeaver.resources.drivers.base - 1.0.110-SNAPSHOT + 1.0.111-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF index 609e4ccc38..76578bc27f 100644 --- a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Server Bundle-SymbolicName: io.cloudbeaver.server;singleton:=true -Bundle-Version: 24.2.5.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 24.3.0.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Activator: io.cloudbeaver.server.CBPlatformActivator diff --git a/server/bundles/io.cloudbeaver.server/pom.xml b/server/bundles/io.cloudbeaver.server/pom.xml index c1df15d32f..e674aef409 100644 --- a/server/bundles/io.cloudbeaver.server/pom.xml +++ b/server/bundles/io.cloudbeaver.server/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.server - 24.2.5-SNAPSHOT + 24.3.0-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF index e1bf687cda..f753b33cdc 100644 --- a/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Administration Bundle-SymbolicName: io.cloudbeaver.service.admin;singleton:=true -Bundle-Version: 1.0.109.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.110.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.admin/pom.xml b/server/bundles/io.cloudbeaver.service.admin/pom.xml index 7b69a7997d..71acee8ddf 100644 --- a/server/bundles/io.cloudbeaver.service.admin/pom.xml +++ b/server/bundles/io.cloudbeaver.service.admin/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.admin - 1.0.109-SNAPSHOT + 1.0.110-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF index 62fff52e87..f54eb321f8 100644 --- a/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Authentication Bundle-SymbolicName: io.cloudbeaver.service.auth;singleton:=true -Bundle-Version: 1.0.109.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.110.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.auth/pom.xml b/server/bundles/io.cloudbeaver.service.auth/pom.xml index 943eb24778..972be7be9e 100644 --- a/server/bundles/io.cloudbeaver.service.auth/pom.xml +++ b/server/bundles/io.cloudbeaver.service.auth/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.auth - 1.0.109-SNAPSHOT + 1.0.110-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF index 4a317c4f3f..7c899f7153 100644 --- a/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Data Transfer Bundle-SymbolicName: io.cloudbeaver.service.data.transfer;singleton:=true -Bundle-Version: 1.0.110.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.111.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml b/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml index ed68b1bc06..716f6f3734 100644 --- a/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml +++ b/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.data.transfer - 1.0.110-SNAPSHOT + 1.0.111-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF index 12b77ec447..4c9a9b339a 100644 --- a/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - File System Bundle-SymbolicName: io.cloudbeaver.service.fs;singleton:=true -Bundle-Version: 1.0.27.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.28.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.fs/pom.xml b/server/bundles/io.cloudbeaver.service.fs/pom.xml index 016ae1e163..c1ae61238b 100644 --- a/server/bundles/io.cloudbeaver.service.fs/pom.xml +++ b/server/bundles/io.cloudbeaver.service.fs/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.fs - 1.0.27-SNAPSHOT + 1.0.28-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF index 6ba80756b2..5d88fe8e2d 100644 --- a/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Metadata Bundle-SymbolicName: io.cloudbeaver.service.metadata;singleton:=true -Bundle-Version: 1.0.113.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.114.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.metadata/pom.xml b/server/bundles/io.cloudbeaver.service.metadata/pom.xml index 0a20df5524..1e1e2f3d33 100644 --- a/server/bundles/io.cloudbeaver.service.metadata/pom.xml +++ b/server/bundles/io.cloudbeaver.service.metadata/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.metadata - 1.0.113-SNAPSHOT + 1.0.114-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF index dbc5f5abb9..60f77cdf24 100644 --- a/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Resource manager NIO implementation Bundle-SymbolicName: io.cloudbeaver.service.rm.nio;singleton:=true -Bundle-Version: 1.0.27.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.28.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml b/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml index 97b4a6b2da..6457bd6f1e 100644 --- a/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml +++ b/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.rm.nio - 1.0.27-SNAPSHOT + 1.0.28-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF index c2c7843837..8fc6de2a28 100644 --- a/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: Cloudbeaver Web Service - Resource manager Bundle-SymbolicName: io.cloudbeaver.service.rm;singleton:=true -Bundle-Version: 1.0.62.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.63.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.rm/pom.xml b/server/bundles/io.cloudbeaver.service.rm/pom.xml index 4ccace9c42..24653a9748 100644 --- a/server/bundles/io.cloudbeaver.service.rm/pom.xml +++ b/server/bundles/io.cloudbeaver.service.rm/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.rm - 1.0.62-SNAPSHOT + 1.0.63-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF index db16db1b1b..374682a3a2 100644 --- a/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: Cloudbeaver Web Service - Security Bundle-Vendor: DBeaver Corp Bundle-SymbolicName: io.cloudbeaver.service.security;singleton:=true -Bundle-Version: 1.0.65.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.66.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.service.security/pom.xml b/server/bundles/io.cloudbeaver.service.security/pom.xml index 18a205d5e0..b4567ab6b5 100644 --- a/server/bundles/io.cloudbeaver.service.security/pom.xml +++ b/server/bundles/io.cloudbeaver.service.security/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.service.security - 1.0.65-SNAPSHOT + 1.0.66-SNAPSHOT eclipse-plugin diff --git a/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF index 00ad68d5d8..7e877266d2 100644 --- a/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.slf4j/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: DBeaver Corp Bundle-Name: CloudBeaver SLF4j Binding Bundle-SymbolicName: io.cloudbeaver.slf4j;singleton:=true -Bundle-Version: 1.0.25.qualifier -Bundle-Release-Date: 20241118 +Bundle-Version: 1.0.26.qualifier +Bundle-Release-Date: 20241202 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/server/bundles/io.cloudbeaver.slf4j/pom.xml b/server/bundles/io.cloudbeaver.slf4j/pom.xml index 96b8d8ab41..71d70e2ebd 100644 --- a/server/bundles/io.cloudbeaver.slf4j/pom.xml +++ b/server/bundles/io.cloudbeaver.slf4j/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.slf4j - 1.0.25-SNAPSHOT + 1.0.26-SNAPSHOT eclipse-plugin diff --git a/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml b/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml index ec65c2a21a..16abcc7a31 100644 --- a/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml +++ b/server/features/io.cloudbeaver.ce.drivers.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml b/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml index 6f1c5d6ca5..2b38e45be3 100644 --- a/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml +++ b/server/features/io.cloudbeaver.ce.drivers.feature/pom.xml @@ -9,6 +9,6 @@ ../ io.cloudbeaver.ce.drivers.feature - 1.0.133-SNAPSHOT + 1.0.134-SNAPSHOT eclipse-feature diff --git a/server/features/io.cloudbeaver.product.ce.feature/feature.xml b/server/features/io.cloudbeaver.product.ce.feature/feature.xml index 83817d2299..3c40e2869a 100644 --- a/server/features/io.cloudbeaver.product.ce.feature/feature.xml +++ b/server/features/io.cloudbeaver.product.ce.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/server/features/io.cloudbeaver.product.ce.feature/pom.xml b/server/features/io.cloudbeaver.product.ce.feature/pom.xml index 6e938928d4..5046d6a67a 100644 --- a/server/features/io.cloudbeaver.product.ce.feature/pom.xml +++ b/server/features/io.cloudbeaver.product.ce.feature/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.product.ce.feature - 24.2.5-SNAPSHOT + 24.3.0-SNAPSHOT eclipse-feature diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml index 9ed477595f..628631759f 100644 --- a/server/features/io.cloudbeaver.server.feature/feature.xml +++ b/server/features/io.cloudbeaver.server.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/server/features/io.cloudbeaver.server.feature/pom.xml b/server/features/io.cloudbeaver.server.feature/pom.xml index ca4d958756..cf2b93d852 100644 --- a/server/features/io.cloudbeaver.server.feature/pom.xml +++ b/server/features/io.cloudbeaver.server.feature/pom.xml @@ -10,6 +10,6 @@ ../ io.cloudbeaver.server.feature - 24.2.5-SNAPSHOT + 24.3.0-SNAPSHOT eclipse-feature diff --git a/server/features/io.cloudbeaver.ws.feature/feature.xml b/server/features/io.cloudbeaver.ws.feature/feature.xml index 63f31ce8cb..ccbee9242a 100644 --- a/server/features/io.cloudbeaver.ws.feature/feature.xml +++ b/server/features/io.cloudbeaver.ws.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/server/features/io.cloudbeaver.ws.feature/pom.xml b/server/features/io.cloudbeaver.ws.feature/pom.xml index 6ae86adae8..03d179e748 100644 --- a/server/features/io.cloudbeaver.ws.feature/pom.xml +++ b/server/features/io.cloudbeaver.ws.feature/pom.xml @@ -10,6 +10,6 @@ ../ io.cloudbeaver.ws.feature - 1.0.63-SNAPSHOT + 1.0.64-SNAPSHOT eclipse-feature diff --git a/server/pom.xml b/server/pom.xml index 43afd2610e..14cc87de26 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -19,7 +19,7 @@ CloudBeaver CE - 24.2.5 + 24.3.0 diff --git a/server/product/web-server/CloudbeaverServer.product b/server/product/web-server/CloudbeaverServer.product index 03517f8893..abc42cf0ce 100644 --- a/server/product/web-server/CloudbeaverServer.product +++ b/server/product/web-server/CloudbeaverServer.product @@ -2,7 +2,7 @@ diff --git a/server/product/web-server/pom.xml b/server/product/web-server/pom.xml index c508ad67b0..0218d3d2c9 100644 --- a/server/product/web-server/pom.xml +++ b/server/product/web-server/pom.xml @@ -9,7 +9,7 @@ 1.0.0-SNAPSHOT ../../ - 24.2.5-SNAPSHOT + 24.3.0-SNAPSHOT web-server eclipse-repository Cloudbeaver Server Product From bbe0e153705f574a53ba413e13101b1a684a2e8c Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Tue, 12 Nov 2024 22:01:04 +0100 Subject: [PATCH 4/5] dbeaver/pro#3641 24.3.0 version bump --- webapp/packages/product-default/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json index 2106c6697d..1b840ab801 100644 --- a/webapp/packages/product-default/package.json +++ b/webapp/packages/product-default/package.json @@ -6,7 +6,7 @@ "src/**/*.scss", "public/**/*" ], - "version": "24.2.5", + "version": "24.3.0", "description": "CloudBeaver Community", "license": "Apache-2.0", "main": "dist/index.js", From 5bcef9278ee565bb890c96fe6407e6982b1fbddd Mon Sep 17 00:00:00 2001 From: serge-rider Date: Wed, 13 Nov 2024 08:38:56 +0100 Subject: [PATCH 5/5] dbeaver/pro#3643 Utils refactoring --- .../src/io/cloudbeaver/DBWebException.java | 3 +-- .../src/io/cloudbeaver/service/fs/model/WebFSServlet.java | 3 +-- .../service/security/internal/ClearAuthAttemptInfoJob.java | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.java index f4cc8e50ea..a06626ed51 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.java @@ -22,7 +22,6 @@ import graphql.language.SourceLocation; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.model.sql.SQLState; -import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.utils.CommonUtils; import java.io.PrintWriter; @@ -100,7 +99,7 @@ public ErrorClassification getErrorType() { @Override public Map getExtensions() { StringWriter buf = new StringWriter(); - GeneralUtils.getRootCause(this).printStackTrace(new PrintWriter(buf, true)); + CommonUtils.getRootCause(this).printStackTrace(new PrintWriter(buf, true)); Map extensions = new LinkedHashMap<>(); String stString = buf.toString(); diff --git a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java index fa2514c98f..9a39ba821d 100644 --- a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java +++ b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java @@ -31,7 +31,6 @@ import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.model.data.json.JSONUtils; import org.jkiss.dbeaver.model.navigator.fs.DBNPathBase; -import org.jkiss.dbeaver.utils.GeneralUtils; import org.jkiss.utils.CommonUtils; import org.jkiss.utils.IOUtils; @@ -100,7 +99,7 @@ private void doPost(WebSession session, HttpServletRequest request, HttpServletR } } catch (Exception e) { throw new DBWebException("File Upload Failed: Unable to Save File to the File System", - GeneralUtils.getRootCause(e)); + CommonUtils.getRootCause(e)); } } } diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java index 9c700dcca4..8eb28b5721 100644 --- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java +++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/ClearAuthAttemptInfoJob.java @@ -23,7 +23,7 @@ import org.jkiss.dbeaver.Log; import org.jkiss.dbeaver.model.runtime.AbstractJob; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.utils.GeneralUtils; +import org.jkiss.utils.CommonUtils; public class ClearAuthAttemptInfoJob extends AbstractJob { @@ -45,7 +45,7 @@ protected IStatus run(DBRProgressMonitor monitor) { securityController.clearOldAuthAttemptInfo(); schedule(CHECK_PERIOD); } catch (DBException e) { - log.error("Error to clear the auth attempt info: " + GeneralUtils.getRootCause(e).getMessage()); + log.error("Error to clear the auth attempt info: " + CommonUtils.getRootCause(e).getMessage()); // Check failed. Re-schedule after 5 seconds schedule(RETRY_PERIOD); }