From 7d714e2580f00801060cc7a22cc0a888dcc15610 Mon Sep 17 00:00:00 2001 From: Wroud Date: Thu, 22 Sep 2022 12:40:11 +0300 Subject: [PATCH 1/5] chore: update version --- webapp/packages/product-default/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json index b5572c25f1..c686c5b85b 100644 --- a/webapp/packages/product-default/package.json +++ b/webapp/packages/product-default/package.json @@ -1,7 +1,7 @@ { "name": "@cloudbeaver/product-default", "sideEffects": false, - "version": "22.2.0", + "version": "22.2.1", "description": "", "license": "Apache-2.0", "main": "lib/index.js", @@ -26,10 +26,9 @@ "@cloudbeaver/plugin-authentication": "0.1.0", "@cloudbeaver/plugin-authentication-administration": "0.1.0", "@cloudbeaver/plugin-connection-custom": "0.1.0", - "@cloudbeaver/plugin-connection-template": "0.1.0", "@cloudbeaver/plugin-connection-search": "0.1.0", + "@cloudbeaver/plugin-connection-template": "0.1.0", "@cloudbeaver/plugin-connections": "0.1.0", - "@cloudbeaver/plugin-projects": "0.1.0", "@cloudbeaver/plugin-data-export": "0.1.0", "@cloudbeaver/plugin-data-spreadsheet-new": "0.1.0", "@cloudbeaver/plugin-data-viewer": "0.1.0", @@ -39,6 +38,7 @@ "@cloudbeaver/plugin-log-viewer": "0.1.0", "@cloudbeaver/plugin-navigation-tree": "0.1.0", "@cloudbeaver/plugin-object-viewer": "0.1.0", + "@cloudbeaver/plugin-projects": "0.1.0", "@cloudbeaver/plugin-settings-menu": "0.1.0", "@cloudbeaver/plugin-settings-menu-administration": "0.1.0", "@cloudbeaver/plugin-sql-editor": "0.1.0", From 257d1ffbe4b98eafcb73c4fe84a33a58d623a6b2 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Thu, 22 Sep 2022 11:44:47 +0200 Subject: [PATCH 2/5] 22.2.1 config --- server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF | 2 +- server/bundles/io.cloudbeaver.product.ce/pom.xml | 2 +- server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF | 2 +- server/bundles/io.cloudbeaver.server/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/pom.xml | 2 +- server/product/web-server/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) 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 2a7365b5ae..4478e208c3 100644 --- a/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: %Bundle-Vendor Bundle-Name: %Bundle-Name Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true -Bundle-Version: 22.2.0.qualifier +Bundle-Version: 22.2.1.qualifier Bundle-Release-Date: 20220926 Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy diff --git a/server/bundles/io.cloudbeaver.product.ce/pom.xml b/server/bundles/io.cloudbeaver.product.ce/pom.xml index 2fa1115bbd..0252c37b26 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 - 22.2.0-SNAPSHOT + 22.2.1-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 8d31d90dbe..d2235f4d73 100644 --- a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF +++ b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: %Bundle-Vendor Bundle-Name: %Bundle-Name Bundle-SymbolicName: io.cloudbeaver.server;singleton:=true -Bundle-Version: 22.2.0.qualifier +Bundle-Version: 22.2.1.qualifier Bundle-Release-Date: 20220926 Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy diff --git a/server/bundles/io.cloudbeaver.server/pom.xml b/server/bundles/io.cloudbeaver.server/pom.xml index 7fb53e2055..dd45c1bf6e 100644 --- a/server/bundles/io.cloudbeaver.server/pom.xml +++ b/server/bundles/io.cloudbeaver.server/pom.xml @@ -10,7 +10,7 @@ ../ io.cloudbeaver.server - 22.2.0-SNAPSHOT + 22.2.1-SNAPSHOT eclipse-plugin diff --git a/server/features/io.cloudbeaver.product.ce.feature/feature.xml b/server/features/io.cloudbeaver.product.ce.feature/feature.xml index fb588dfa1d..f7ef318f24 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 78ccca0e67..e8c1d5c337 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 - 22.2.0-SNAPSHOT + 22.2.1-SNAPSHOT eclipse-feature diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml index 7a4032a6eb..375bc80eb3 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 a1fda267bc..def28b0252 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 - 22.2.0-SNAPSHOT + 22.2.1-SNAPSHOT eclipse-feature diff --git a/server/pom.xml b/server/pom.xml index 47c25dd7d5..cb28b2f403 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -19,7 +19,7 @@ CloudBeaver CE - 22.2.0 + 22.2.1 diff --git a/server/product/web-server/pom.xml b/server/product/web-server/pom.xml index c8acd31027..9489915eca 100644 --- a/server/product/web-server/pom.xml +++ b/server/product/web-server/pom.xml @@ -9,7 +9,7 @@ 1.0.0-SNAPSHOT ../../ - 22.2.0-SNAPSHOT + 22.2.1-SNAPSHOT web-server eclipse-repository Cloudbeaver Server Product From 38c552dc6b09b33c90f3330423dc1d48eef8970d Mon Sep 17 00:00:00 2001 From: Wroud Date: Thu, 22 Sep 2022 12:53:21 +0300 Subject: [PATCH 3/5] CB-2634 fix: resources sync --- webapp/packages/core-connections/src/ConnectionInfoResource.ts | 2 +- .../core-navigation-tree/src/NodesManager/NavTreeResource.ts | 2 +- webapp/packages/core-projects/src/ProjectsService.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts index 6b21cc7cf9..558e286318 100644 --- a/webapp/packages/core-connections/src/ConnectionInfoResource.ts +++ b/webapp/packages/core-connections/src/ConnectionInfoResource.ts @@ -97,7 +97,7 @@ export class ConnectionInfoResource extends CachedMapResource this.sessionUpdate)); permissionsResource.require(this, EPermission.public); - this.sync(this.projectInfoResource, () => CachedMapAllKey); + this.sync(this.projectInfoResource, () => CachedMapAllKey, () => CachedMapAllKey); sessionDataResource.onDataOutdated.addHandler(() => { this.sessionUpdate = true; diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts b/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts index 51f969ad07..be2eaec544 100644 --- a/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts +++ b/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts @@ -111,7 +111,7 @@ export class NavTreeResource extends CachedMapResource { // navNodeInfoResource.preloadResource(this); this.outdateResource(navNodeInfoResource); this.updateResource(navNodeInfoResource); - this.sync(this.projectInfoResource, () => CachedMapAllKey); + this.sync(this.projectInfoResource, () => CachedMapAllKey, () => CachedMapAllKey); this.sessionDataResource.outdateResource(this); this.userInfoResource.onUserChange.addHandler(action(() => { this.clear(); diff --git a/webapp/packages/core-projects/src/ProjectsService.ts b/webapp/packages/core-projects/src/ProjectsService.ts index a65dbd8121..03a4921feb 100644 --- a/webapp/packages/core-projects/src/ProjectsService.ts +++ b/webapp/packages/core-projects/src/ProjectsService.ts @@ -64,7 +64,7 @@ export class ProjectsService { get defaultProject(): ProjectInfo | undefined { let project = this.userProject; - if (!project && this.activeProjects.length > 0) { + if ((!project || this.activeProjectIds.length > 0) && this.activeProjects.length > 0) { project = this.activeProjects[0]; } From f9188eb747f107e9b578b30c0f1a46dea9a47cae Mon Sep 17 00:00:00 2001 From: Wroud Date: Thu, 22 Sep 2022 12:55:51 +0300 Subject: [PATCH 4/5] CB-2639 chore: hide devtools switcher --- .../plugin-devtools/src/PluginBootstrap.ts | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/webapp/packages/plugin-devtools/src/PluginBootstrap.ts b/webapp/packages/plugin-devtools/src/PluginBootstrap.ts index cea524c9c0..b8a5356561 100644 --- a/webapp/packages/plugin-devtools/src/PluginBootstrap.ts +++ b/webapp/packages/plugin-devtools/src/PluginBootstrap.ts @@ -54,30 +54,30 @@ export class PluginBootstrap extends Bootstrap { }); - this.actionService.addHandler({ - id: 'devtools', - isActionApplicable: (context, action) => [ - ACTION_DEVTOOLS, - ].includes(action), - isChecked: (context, action) => { + // this.actionService.addHandler({ + // id: 'devtools', + // isActionApplicable: (context, action) => [ + // ACTION_DEVTOOLS, + // ].includes(action), + // isChecked: (context, action) => { - switch (action) { - case ACTION_DEVTOOLS: { - return this.devToolsService.isEnabled; - } - } + // switch (action) { + // case ACTION_DEVTOOLS: { + // return this.devToolsService.isEnabled; + // } + // } - return false; - }, - handler: (context, action) => { - switch (action) { - case ACTION_DEVTOOLS: { - this.devToolsService.switch(); - break; - } - } - }, - }); + // return false; + // }, + // handler: (context, action) => { + // switch (action) { + // case ACTION_DEVTOOLS: { + // this.devToolsService.switch(); + // break; + // } + // } + // }, + // }); this.menuService.addCreator({ isApplicable: context => { From 1779823420a0bfa1f1d3c15942de344e606bcd1e Mon Sep 17 00:00:00 2001 From: serge-rider Date: Thu, 22 Sep 2022 14:20:27 +0200 Subject: [PATCH 5/5] dbeaver/dbeaver-ee#1979 Project permissions check fix --- .../model/rm/local/LocalResourceController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java index 7270a19da3..a043029a2e 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java @@ -776,4 +776,12 @@ public class LocalResourceController implements RMController { return RMProject.Type.GLOBAL.getPrefix().equals(rmProjectName.getPrefix()); } + public static boolean isPrivateProject(String projectId, String userId) { + RMProjectName rmProjectName = parseProjectName(projectId); + return RMProject.Type.USER.getPrefix().equals(rmProjectName.getPrefix()) && + rmProjectName.name.equals(userId); + } + + + }