From 30e1cb5ef4aadc0bbf89dfe6b27b0317989affee Mon Sep 17 00:00:00 2001 From: Oksana Cherniavskaia Date: Tue, 18 Oct 2022 16:24:55 +0300 Subject: [PATCH 1/4] CB-2602 fix: Require team name upon creation. Adjust graphql schema - Modify graphql schema to require team name for createTeam mutation --- .../io.cloudbeaver.service.admin/schema/service.admin.graphqls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls b/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls index 6162ff0f8b..864d3f0922 100644 --- a/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls +++ b/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls @@ -123,7 +123,7 @@ extend type Query { createUser(userId: ID!, enabled: Boolean!, authRole: String): AdminUserInfo! deleteUser(userId: ID!): Boolean - createTeam(teamId: ID!, teamName: String, description: String): AdminTeamInfo! + createTeam(teamId: ID!, teamName: String!, description: String): AdminTeamInfo! updateTeam(teamId: ID!, teamName: String, description: String): AdminTeamInfo! deleteTeam(teamId: ID!): Boolean From be2ab3326ebf1f51aeb03688f8f17bfe6ebaaf58 Mon Sep 17 00:00:00 2001 From: naumov Date: Wed, 19 Oct 2022 20:15:57 +0400 Subject: [PATCH 2/4] fix(plugin-connections-administration): CB-2602 fallback to teamId --- .../schema/service.admin.graphqls | 2 +- .../ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls b/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls index 864d3f0922..6162ff0f8b 100644 --- a/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls +++ b/server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls @@ -123,7 +123,7 @@ extend type Query { createUser(userId: ID!, enabled: Boolean!, authRole: String): AdminUserInfo! deleteUser(userId: ID!): Boolean - createTeam(teamId: ID!, teamName: String!, description: String): AdminTeamInfo! + createTeam(teamId: ID!, teamName: String, description: String): AdminTeamInfo! updateTeam(teamId: ID!, teamName: String, description: String): AdminTeamInfo! deleteTeam(teamId: ID!): Boolean diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx index b51bf9f9ca..077e6f7d98 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx @@ -112,8 +112,8 @@ export const ConnectionAccessList = observer(function ConnectionAccessLis Date: Wed, 19 Oct 2022 20:55:48 +0400 Subject: [PATCH 3/4] fix(plugin-connections-administration): CB-2602 fallback to teamId for granted list --- .../ConnectionAccess/ConnectionAccessGrantedList.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx index 588cb6e5a1..7236699c79 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx @@ -117,8 +117,8 @@ export const ConnectionAccessGrantedList = observer(function ConnectionAc Date: Wed, 19 Oct 2022 21:43:51 +0400 Subject: [PATCH 4/4] fix(plugin-connections-administration): CB-2602 show teamId instead of teamName in tooltip --- .../ConnectionAccess/ConnectionAccessGrantedList.tsx | 2 +- .../ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx index 7236699c79..b7725a6e5a 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx @@ -118,7 +118,7 @@ export const ConnectionAccessGrantedList = observer(function ConnectionAc key={team.teamId} id={team.teamId} name={team.teamName || team.teamId} - tooltip={team.teamName || team.teamId} + tooltip={team.teamId} description={team.description} icon='/icons/team.svg' iconTooltip={translate('authentication_team_icon_tooltip')} diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx index 077e6f7d98..21bcbb7520 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx @@ -113,7 +113,7 @@ export const ConnectionAccessList = observer(function ConnectionAccessLis key={team.teamId} id={team.teamId} name={team.teamName || team.teamId} - tooltip={team.teamName || team.teamId} + tooltip={team.teamId} description={team.description} icon='/icons/team.svg' iconTooltip={translate('authentication_team_icon_tooltip')}