diff --git a/packages/components/containers/vpn/gateways/helpers.tsx b/packages/components/containers/vpn/gateways/helpers.tsx index d6758d7edc..6578f2381e 100644 --- a/packages/components/containers/vpn/gateways/helpers.tsx +++ b/packages/components/containers/vpn/gateways/helpers.tsx @@ -18,6 +18,14 @@ export const getSuffix = (name: string | undefined) => name?.match(/#\d+$/)?.[0] const locations: Record = {}; +const sortGatewayUsers = (a: GatewayUser, b: GatewayUser): number => { + if (!a.Name || !b.Name) { + return 0; + } + + return a.Name.localeCompare(b.Name); +}; + const getAverageLoad = (servers: GatewayServer[]) => servers.reduce((load, server) => load + server.Load, 0) / servers.length; @@ -95,7 +103,7 @@ const GroupItem = ({ group, keyPrefix, id }: GroupItemProps) => { - {group?.Users.map((user) => ( + {group?.Users.sort(sortGatewayUsers).map((user) => (