From 7f5f7510ea2cf0609e04bcbac48c409b54410aa5 Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Tue, 31 May 2022 14:47:35 +0300 Subject: [PATCH 1/3] CB-1607 add empty hash to redirect url on autologin (#877) --- .../src/io/cloudbeaver/server/servlets/CBStaticServlet.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java index 7415942bc9..1c0cd6311a 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java @@ -102,6 +102,10 @@ public class CBStaticServlet extends DefaultServlet { WebSession webSession = CBPlatform.getInstance().getSessionManager().getWebSession(request, response, false); if (webSession.getUser() == null) { String signInLink = ((SMWAuthProviderFederated) authProviderInstance).getSignInLink(configId, Collections.emptyMap()); + //ignore current routing if non-root page is open + if (!signInLink.endsWith("#")) { + signInLink += "#"; + } if (!CommonUtils.isEmpty(signInLink)) { // Redirect to it request.getSession().setAttribute(DBWConstants.STATE_ATTR_SIGN_IN_STATE, DBWConstants.SignInState.GLOBAL); From 9ba9c78f6ca910937017cf71a60869fc28cbd99b Mon Sep 17 00:00:00 2001 From: Ainur <59531286+yagudin10@users.noreply.github.com> Date: Tue, 31 May 2022 14:49:19 +0300 Subject: [PATCH 2/3] CB-2084 dynamodb, couchbase remove erd tab (#878) --- .../service/navigator/WebDatabaseObjectInfo.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java index b8f0aefec4..4e942d0e1f 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java @@ -181,7 +181,11 @@ public class WebDatabaseObjectInfo { } } if (object instanceof DBSDataManipulator) features.add(OBJECT_FEATURE_DATA_MANIPULATOR); - if (object instanceof DBSEntity && !(object instanceof DBSDataType) && isDiagramSupported) { + if (object instanceof DBSEntity && + !(object instanceof DBSDataType) && + !(object instanceof DBSDocumentContainer) && + isDiagramSupported + ) { features.add(OBJECT_FEATURE_ENTITY); } if (object instanceof DBSSchema) features.add(OBJECT_FEATURE_SCHEMA); From 9bdcdefd08b50a6e2561eedc3ec67d27381d5c19 Mon Sep 17 00:00:00 2001 From: Ainur <59531286+yagudin10@users.noreply.github.com> Date: Tue, 31 May 2022 14:55:18 +0300 Subject: [PATCH 3/3] CB-1327 redis db remove diagram (#876) --- .../cloudbeaver/service/navigator/WebDatabaseObjectInfo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java index 4e942d0e1f..16d0bb2434 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java @@ -26,6 +26,7 @@ import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor; import org.jkiss.dbeaver.model.struct.*; import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog; import org.jkiss.dbeaver.model.struct.rdb.DBSSchema; +import org.jkiss.dbeaver.model.struct.rdb.DBSTable; import org.jkiss.dbeaver.runtime.properties.PropertyCollector; import org.jkiss.utils.CommonUtils; @@ -194,7 +195,7 @@ public class WebDatabaseObjectInfo { features.add(OBJECT_FEATURE_OBJECT_CONTAINER); try { Class childType = ((DBSObjectContainer) object).getPrimaryChildType(null); - if (DBSEntity.class.isAssignableFrom(childType)) { + if (DBSTable.class.isAssignableFrom(childType)) { features.add(OBJECT_FEATURE_ENTITY_CONTAINER); } } catch (Exception e) {