From 0126b204c015d814f358fc4ba64ffba216b39c55 Mon Sep 17 00:00:00 2001 From: sergeyteleshev Date: Thu, 24 Oct 2024 17:34:41 +0200 Subject: [PATCH] CB-5566 fixes checkboxes for tables (#3026) Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com> --- .../Users/Teams/GrantedConnections/ConnectionList.tsx | 2 +- .../Users/Teams/GrantedConnections/GrantedConnectionsList.tsx | 2 +- .../Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx | 2 +- .../src/Administration/Users/Teams/GrantedUsers/UserList.tsx | 2 +- .../ConnectionAccess/ConnectionAccessGrantedList.tsx | 2 +- .../ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx index 7c602d98d1..6202c74a1e 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx @@ -59,7 +59,7 @@ export const ConnectionList = observer(function ConnectionList({ connecti }, []); const connections = getFilteredConnections(connectionList, connectionsOrigins, filterState.filterValue); - const keys = connections.map(connection => connection.id); + const keys = connectionList.map(connection => connection.id); return ( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx index 76116fff19..cb4d37bdd7 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx @@ -59,7 +59,7 @@ export const GrantedConnectionList = observer(function GrantedConnectionL const [filterState] = useState(() => observable({ filterValue: '' })); const connections = getFilteredConnections(grantedConnections, connectionsOrigins, filterState.filterValue); - const keys = connections.map(connection => connection.id); + const keys = grantedConnections.map(connection => connection.id); const selected = getComputed(() => Array.from(selectedSubjects.values()).some(v => v)); diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx index d07ed564dc..a972694e40 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx @@ -61,7 +61,7 @@ export const GrantedUserList = observer(function GrantedUserList({ grante const selected = getComputed(() => Array.from(selectedSubjects.values()).some(v => v)); const users = getFilteredUsers(grantedUsers, filterState.filterValue) as IGrantedUser[]; - const keys = users.map(user => user.userId); + const keys = grantedUsers.map(user => user.userId); const revoke = useCallback(() => { props.onRevoke(getSelectedItems(selectedSubjects)); diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx index 79cc3bc680..f7d8b20a2b 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx @@ -56,7 +56,7 @@ export const UserList = observer(function UserList({ userList, grantedUse const selected = getComputed(() => Array.from(selectedSubjects.values()).some(v => v)); const users = getFilteredUsers(userList, filterState.filterValue); - const keys = users.map(user => user.userId); + const keys = userList.map(user => user.userId); const grant = useCallback(() => { props.onGrant(getSelectedItems(selectedSubjects)); 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 12426de2e7..599a8d1539 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx @@ -63,7 +63,7 @@ export const ConnectionAccessGrantedList = observer(function ConnectionAc const teams = getFilteredTeams(grantedTeams, filterState.filterValue); const users = getFilteredUsers(grantedUsers, filterState.filterValue); - const keys = teams.map(team => team.teamId).concat(users.map(user => user.userId)); + const keys = grantedTeams.map(team => team.teamId).concat(grantedUsers.map(user => user.userId)); let tableInfoText: TLocalizationToken = 'connections_connection_access_admin_info'; if (!keys.length) { 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 c3d292c221..1a595ec835 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx @@ -49,7 +49,7 @@ export const ConnectionAccessList = observer(function ConnectionAccessLis const teams = getFilteredTeams(teamList, filterState.filterValue); const users = getFilteredUsers(userList, filterState.filterValue); - const keys = teams.map(team => team.teamId).concat(users.map(user => user.userId)); + const keys = teamList.map(team => team.teamId).concat(userList.map(user => user.userId)); const selected = getComputed(() => Array.from(selectedSubjects.values()).some(v => v));