From 56765702caa193d083abe8f475b6ad1e2fd27eb5 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Wed, 3 May 2023 15:38:19 -0400 Subject: [PATCH 1/3] Add missing user groups entry to getEmptyResource state. UserGroups will be requestable, so the UI needs to include user_group in the empty resource state. --- .../src/ui/services/workspacesService/accessRequestsService.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts index 1d066f6c3af1f..6786887804a95 100644 --- a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts +++ b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts @@ -84,5 +84,6 @@ export function getEmptyPendingAccessRequest() { app: {}, role: {}, windows_desktop: {}, + user_group: {}, }; } From 5e69842c8e7550afd0c757d29cb0888f95b01ea0 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Wed, 3 May 2023 15:45:09 -0400 Subject: [PATCH 2/3] Update test for object change. --- .../src/ui/services/workspacesService/workspacesService.test.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.test.ts b/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.test.ts index 049531935dc5e..216b18abdee41 100644 --- a/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.test.ts +++ b/web/packages/teleterm/src/ui/services/workspacesService/workspacesService.test.ts @@ -119,6 +119,7 @@ describe('restoring workspace', () => { node: {}, role: {}, windows_desktop: {}, + user_group: {}, }, isBarCollapsed: false, }, @@ -152,6 +153,7 @@ describe('restoring workspace', () => { node: {}, role: {}, windows_desktop: {}, + user_group: {}, }, }, localClusterUri: testClusterUri, From ed09b5b88a7b6a64d0ed52c1052879648457f037 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Wed, 3 May 2023 15:52:40 -0400 Subject: [PATCH 3/3] Add missing references to user_group. --- .../services/workspacesService/accessRequestsService.test.ts | 1 + .../src/ui/services/workspacesService/accessRequestsService.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.test.ts b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.test.ts index c73f6b11d3154..1ebb2310f6a0c 100644 --- a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.test.ts +++ b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.test.ts @@ -41,6 +41,7 @@ function getMockPendingAccessRequest(): PendingAccessRequest { access: 'access', }, kube_cluster: {}, + user_group: {}, }; } diff --git a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts index 6786887804a95..7de47fabc0bac 100644 --- a/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts +++ b/web/packages/teleterm/src/ui/services/workspacesService/accessRequestsService.ts @@ -60,7 +60,8 @@ export class AccessRequestsService { Object.keys(pendingAccessRequest.db).length + Object.keys(pendingAccessRequest.app).length + Object.keys(pendingAccessRequest.kube_cluster).length + - Object.keys(pendingAccessRequest.windows_desktop).length + Object.keys(pendingAccessRequest.windows_desktop).length + + Object.keys(pendingAccessRequest.user_group).length ); }