Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

feat(waiting-room): choose relations when associated endpoint [EE-5187] (#8720)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-05-14 09:26:11 +07:00 • committed by GitHub
parent 511adabce2
commit 365316971b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 1712 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/react/edge/edge-devices/WaitingRoomView/Datatable/useEnvironments.ts
View file

@ -55,7 +55,7 @@ export function useEnvironments() {
const envs: Array<WaitingRoomEnvironment> =
environmentsQuery.environments.map((env) => ({
...env,
Group: groupsQuery.data?.[env.GroupId] || '',
Group: (env.GroupId !== 1 && groupsQuery.data?.[env.GroupId]) || '',
EdgeGroups:
environmentEdgeGroupsQuery.data?.[env.Id]?.map((env) => env.group) ||
[],