Merge remote-tracking branch 'origin/CB-5738-te-support-user-access-t…

…oken' into CB-5738-te-support-user-access-token
dbeaver · Oct 24, 2024 · bfa1190 · bfa1190
2 parents 1410dfc + afa9c8f
commit bfa1190
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...ation-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx b/...ation-administration/src/Administration/Users/Teams/GrantedConnections/ConnectionList.tsx
@@ -59,7 +59,7 @@ export const ConnectionList = observer<Props>(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 (
     <Group className={s(style, { group: true })} box border medium overflow vertical>

diff --git a/...ministration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx b/...ministration/src/Administration/Users/Teams/GrantedConnections/GrantedConnectionsList.tsx
@@ -59,7 +59,7 @@ export const GrantedConnectionList = observer<Props>(function GrantedConnectionL
   const [filterState] = useState<IFilterState>(() => 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/...entication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx b/...entication-administration/src/Administration/Users/Teams/GrantedUsers/GrantedUserList.tsx
@@ -61,7 +61,7 @@ export const GrantedUserList = observer<Props>(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/...in-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx b/...in-authentication-administration/src/Administration/Users/Teams/GrantedUsers/UserList.tsx
@@ -56,7 +56,7 @@ export const UserList = observer<Props>(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/...ctions-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx b/...ctions-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx
@@ -63,7 +63,7 @@ export const ConnectionAccessGrantedList = observer<Props>(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/...n-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx b/...n-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx
@@ -49,7 +49,7 @@ export const ConnectionAccessList = observer<Props>(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));