From a70b48db349429c27451edfae41faa32c789b463 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Mon, 12 Oct 2020 22:04:19 +0300 Subject: [PATCH 1/6] CB-346 Sampel project config fix --- .../GlobalConfiguration/.dbeaver/data-sources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json b/samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json index f26226c0c8..27dbbe907a 100644 --- a/samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json +++ b/samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json @@ -11,7 +11,7 @@ "read-only": false, "template": false, "configuration": { - "database": "${application.path}/samples/db/Chinook.sqlitedb", + "database": "${application.path}/../samples/db/Chinook.sqlitedb", "type": "dev", "auth-model": "native" } From 7ad31a587ed2524d6644f6e755f2dd02da7f2f7e Mon Sep 17 00:00:00 2001 From: serge-rider Date: Mon, 12 Oct 2020 22:13:29 +0300 Subject: [PATCH 2/6] CB-346 Sample db build script --- deploy/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/build.sh b/deploy/build.sh index 35ae804ae1..0cae000c8e 100755 --- a/deploy/build.sh +++ b/deploy/build.sh @@ -29,7 +29,7 @@ cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/a cp -p ./scripts/* ./cloudbeaver mkdir cloudbeaver/samples mkdir cloudbeaver/samples/db -cp -rp ../samples/sample-databases/db cloudbeaver/samples/db +cp -rp ../samples/sample-databases/db cloudbeaver/samples/ cp -rp ../samples/sample-databases/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf cp -p ../samples/sample-databases/*.conf cloudbeaver/conf/ mv drivers cloudbeaver From 6582b0357c7eb75657e2c8e71c13c79ad21e0680 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Mon, 12 Oct 2020 19:21:06 +0000 Subject: [PATCH 3/6] Docker run script --- deploy/docker/run-docker-container.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker/run-docker-container.sh b/deploy/docker/run-docker-container.sh index b9084e533f..fe1b87f381 100755 --- a/deploy/docker/run-docker-container.sh +++ b/deploy/docker/run-docker-container.sh @@ -1,2 +1,2 @@ -docker run -ti -p 8978:8978 dbeaver/cloudbeaver:dev +docker run --name cloudbeaver --rm -ti -p 8978:8978 -v /var/cloudbeaver/workspace:/opt/cloudbeaver/workspace dbeaver/cloudbeaver:dev From 83be5f717813b61a73f9ead67b8b2e4e44cc06cc Mon Sep 17 00:00:00 2001 From: Wroud Date: Tue, 13 Oct 2020 15:32:31 +0300 Subject: [PATCH 4/6] chore(core-app): CB-336 update logo --- webapp/packages/core-app/public/icons/logo.svg | 17 +++++++---------- .../packages/core-blocks/src/layout/AppLogo.tsx | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/webapp/packages/core-app/public/icons/logo.svg b/webapp/packages/core-app/public/icons/logo.svg index 8e6b2b2320..ea2b98dc80 100644 --- a/webapp/packages/core-app/public/icons/logo.svg +++ b/webapp/packages/core-app/public/icons/logo.svg @@ -1,11 +1,8 @@ - - - - - - - - - - + + + + + + + diff --git a/webapp/packages/core-blocks/src/layout/AppLogo.tsx b/webapp/packages/core-blocks/src/layout/AppLogo.tsx index f3bb6725cc..5f1684ef2b 100644 --- a/webapp/packages/core-blocks/src/layout/AppLogo.tsx +++ b/webapp/packages/core-blocks/src/layout/AppLogo.tsx @@ -21,7 +21,7 @@ const styles = css` } IconOrImage { - height: 24px; + height: 28px; width: 150px; margin-bottom: 2px; } From 023eeda045707dd328e1bb6731d4bb41f00bde30 Mon Sep 17 00:00:00 2001 From: Wroud Date: Tue, 13 Oct 2020 15:43:23 +0300 Subject: [PATCH 5/6] fix(plugin-authentication): CB-416 user editing login check --- .../Users/UserForm/UserFormController.ts | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts index c9ccfc9983..5c2d90ebff 100644 --- a/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts +++ b/webapp/packages/plugin-authentication/src/Administration/Users/UserForm/UserFormController.ts @@ -143,19 +143,21 @@ export class UserFormController implements IInitializableController, IDestructib }; private validate() { - if (!this.credentials.login.trim()) { - this.notificationService.logError({ title: 'authentication_user_login_not_set' }); - return; - } + if (!this.editing) { + if (!this.credentials.login.trim()) { + this.notificationService.logError({ title: 'authentication_user_login_not_set' }); + return; + } - if (this.rolesManagerService.roles.has(this.credentials.login)) { - this.notificationService.logError({ title: 'authentication_user_login_cant_be_used' }); - return; - } + if (this.rolesManagerService.roles.has(this.credentials.login)) { + this.notificationService.logError({ title: 'authentication_user_login_cant_be_used' }); + return; + } - if (this.usersResource.has(this.credentials.login)) { - this.notificationService.logError({ title: 'authentication_user_login_already_exists' }); - return; + if (this.usersResource.has(this.credentials.login)) { + this.notificationService.logError({ title: 'authentication_user_login_already_exists' }); + return; + } } if (!this.isRoleSelected()) { From 1c30edfcb48a6606a7cea7c73b537fd8e99af374 Mon Sep 17 00:00:00 2001 From: Naumov Alexey Date: Tue, 13 Oct 2020 16:08:13 +0300 Subject: [PATCH 6/6] fix(plugin-sql-editor): CB-358 no active tabs placeholder message CB-358 --- .../plugin-sql-editor/src/SqlEditorNavigatorService.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts index 47d197da8a..2e1287d07f 100644 --- a/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts +++ b/webapp/packages/plugin-sql-editor/src/SqlEditorNavigatorService.ts @@ -132,11 +132,21 @@ export class SqlEditorNavigatorService { if (data.type === SQLEditorNavigationAction.select) { tab.handlerState.currentResultTabId = data.resultId; } else if (data.type === SQLEditorNavigationAction.close) { + const resultTabGroupId = tab.handlerState.resultTabs + .find(resultTab => resultTab.resultTabId === data.resultId)?.groupId; + tab.handlerState.resultTabs.splice( tab.handlerState.resultTabs.findIndex(result => result.resultTabId === data.resultId), 1 ); + const isGroupEmpty = !tab.handlerState.resultTabs.some(resultTab => resultTab.groupId === resultTabGroupId); + + if (isGroupEmpty) { + tab.handlerState.queryTabGroups.splice( + tab.handlerState.queryTabGroups.findIndex(queryTabGroup => queryTabGroup.groupId === resultTabGroupId), 1); + } + if (tab.handlerState.currentResultTabId === data.resultId) { if (tab.handlerState.resultTabs.length > 0) { tab.handlerState.currentResultTabId = tab.handlerState.resultTabs[0].resultTabId;