opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/devel' into feat/cb-2479/shared-projects-ux

Browse Source
This commit is contained in:
Wroud
2022-09-22 13:03:45 +03:00
parent acd5b5f7ba 7d2d540190
commit fa706ab165
14 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF
+1 -1
View File
@@ -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
server/bundles/io.cloudbeaver.product.ce/pom.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<relativePath>../</relativePath>
</parent>
<artifactId>io.cloudbeaver.product.ce</artifactId>
<version>22.2.0-SNAPSHOT</version>
<version>22.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
+1 -1
View File
@@ -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
server/bundles/io.cloudbeaver.server/pom.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<relativePath>../</relativePath>
</parent>
<artifactId>io.cloudbeaver.server</artifactId>
<version>22.2.0-SNAPSHOT</version>
<version>22.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
server/features/io.cloudbeaver.product.ce.feature/feature.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<feature
id="io.cloudbeaver.product.ce.feature"
label="%featureName"
version="22.2.0.qualifier"
version="22.2.1.qualifier"
provider-name="%providerName"
plugin="io.cloudbeaver.product.ce">
server/features/io.cloudbeaver.product.ce.feature/pom.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<relativePath>../</relativePath>
</parent>
<artifactId>io.cloudbeaver.product.ce.feature</artifactId>
<version>22.2.0-SNAPSHOT</version>
<version>22.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
server/features/io.cloudbeaver.server.feature/feature.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<feature
id="io.cloudbeaver.server.feature"
label="%featureName"
version="22.2.0.qualifier"
version="22.2.1.qualifier"
provider-name="%providerName"
plugin="io.cloudbeaver.server">
server/features/io.cloudbeaver.server.feature/pom.xml
+1 -1
View File
@@ -10,6 +10,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>io.cloudbeaver.server.feature</artifactId>
<version>22.2.0-SNAPSHOT</version>
<version>22.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
server/pom.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<properties>
<dbeaver-product>CloudBeaver CE</dbeaver-product>
<dbeaver-version>22.2.0</dbeaver-version>
<dbeaver-version>22.2.1</dbeaver-version>
</properties>
<modules>
server/product/web-server/pom.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<version>22.2.0-SNAPSHOT</version>
<version>22.2.1-SNAPSHOT</version>
<artifactId>web-server</artifactId>
<packaging>eclipse-repository</packaging>
<name>Cloudbeaver Server Product</name>
webapp/packages/core-connections/src/ConnectionInfoResource.ts
+1 -1
View File
@@ -97,7 +97,7 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
this.onConnectionCreate.addHandler(ExecutorInterrupter.interrupter(() => this.sessionUpdate));
permissionsResource.require(this, EPermission.public);
this.sync(this.projectInfoResource, () => CachedMapAllKey);
this.sync(this.projectInfoResource, () => CachedMapAllKey, () => CachedMapAllKey);
sessionDataResource.onDataOutdated.addHandler(() => {
this.sessionUpdate = true;
webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
+1 -1
View File
@@ -111,7 +111,7 @@ export class NavTreeResource extends CachedMapResource<string, string[]> {
// 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();
webapp/packages/core-projects/src/ProjectsService.ts
+1 -1
View File
@@ -64,7 +64,7 @@ export class ProjectsService {
get defaultProject(): ProjectInfo | undefined {
let project = this.userProject;
if (!project || (this.activeProjectIds.length > 0 && this.activeProjects.length > 0)) {
if ((!project || this.activeProjectIds.length > 0) && this.activeProjects.length > 0) {
project = this.activeProjects[0];
}
webapp/packages/product-default/package.json
+3 -3
View File
@@ -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",