-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[v16] Support resource availability switcher in Connect (#42756)
* Add `AvailableResourceMode` to the updated preferences in the handler * Improve the preferences parser to handle missing properties, as well as the entire object being undefined * Add support for resource availability switcher * Show requestable resources only if the cluster supports access requests * Return an object with `searchAsRoles` and `includeRequestable`
- Loading branch information
Showing
9 changed files
with
470 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
272 changes: 272 additions & 0 deletions
272
web/packages/teleterm/src/ui/DocumentCluster/UnifiedResources.test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,272 @@ | ||
| /** | ||
| * Teleport | ||
| * Copyright (C) 2024 Gravitational, Inc. | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import { render, screen } from 'design/utils/testing'; | ||
| import { mockIntersectionObserver } from 'jsdom-testing-mocks'; | ||
| import { act } from '@testing-library/react'; | ||
|
|
||
| import { | ||
| AvailableResourceMode, | ||
| DefaultTab, | ||
| ViewMode, | ||
| LabelsViewMode, | ||
| } from 'gen-proto-ts/teleport/userpreferences/v1/unified_resource_preferences_pb'; | ||
| import { ShowResources } from 'gen-proto-ts/teleport/lib/teleterm/v1/cluster_pb'; | ||
|
|
||
| import { UnifiedResources } from 'teleterm/ui/DocumentCluster/UnifiedResources'; | ||
| import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider'; | ||
| import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesContext'; | ||
| import { ConnectMyComputerContextProvider } from 'teleterm/ui/ConnectMyComputer'; | ||
| import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider'; | ||
| import { makeDocumentCluster } from 'teleterm/ui/services/workspacesService/documentsService/testHelpers'; | ||
| import { MockAppContext } from 'teleterm/ui/fixtures/mocks'; | ||
| import { | ||
| makeRootCluster, | ||
| rootClusterUri, | ||
| } from 'teleterm/services/tshd/testHelpers'; | ||
| import { getEmptyPendingAccessRequest } from 'teleterm/ui/services/workspacesService/accessRequestsService'; | ||
|
|
||
| import { MockedUnaryCall } from 'teleterm/services/tshd/cloneableClient'; | ||
|
|
||
| const mio = mockIntersectionObserver(); | ||
|
|
||
| const tests = [ | ||
| { | ||
| name: 'fetches only available resources if cluster does not support access requests', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: false, | ||
| showResources: ShowResources.REQUESTABLE, | ||
| availableResourceModePreference: AvailableResourceMode.ALL, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: false, | ||
| includeRequestable: false, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'fetches all resources if cluster allows listing all and user preferences says all', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: true, | ||
| showResources: ShowResources.REQUESTABLE, | ||
| availableResourceModePreference: AvailableResourceMode.ALL, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: false, | ||
| includeRequestable: true, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'fetches all resources if cluster allows listing all and user preferences says none', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: true, | ||
| showResources: ShowResources.REQUESTABLE, | ||
| availableResourceModePreference: AvailableResourceMode.ALL, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: false, | ||
| includeRequestable: true, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'fetches accessible resources if cluster allows listing all and user preferences says accessible', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: true, | ||
| showResources: ShowResources.REQUESTABLE, | ||
| availableResourceModePreference: AvailableResourceMode.ACCESSIBLE, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: false, | ||
| includeRequestable: false, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'fetches requestable resources if cluster allows listing all and user preferences says requestable', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: true, | ||
| showResources: ShowResources.REQUESTABLE, | ||
| availableResourceModePreference: AvailableResourceMode.REQUESTABLE, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: true, | ||
| includeRequestable: false, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'fetches only accessible resources if cluster does not allow listing all', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: true, | ||
| showResources: ShowResources.ACCESSIBLE_ONLY, | ||
| availableResourceModePreference: AvailableResourceMode.UNSPECIFIED, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: false, | ||
| includeRequestable: false, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'fetches only accessible resources if cluster does not allow listing all and user preferences says accessible', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: true, | ||
| showResources: ShowResources.ACCESSIBLE_ONLY, | ||
| availableResourceModePreference: AvailableResourceMode.ALL, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: false, | ||
| includeRequestable: false, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'fetches only requestable resources if cluster does not allow listing all and user preferences says requestable', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: true, | ||
| showResources: ShowResources.ACCESSIBLE_ONLY, | ||
| availableResourceModePreference: AvailableResourceMode.REQUESTABLE, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: true, | ||
| includeRequestable: false, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'fetches only accessible resources if cluster does not allow listing all but user preferences says all', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: true, | ||
| showResources: ShowResources.ACCESSIBLE_ONLY, | ||
| availableResourceModePreference: AvailableResourceMode.ALL, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: false, | ||
| includeRequestable: false, | ||
| }, | ||
| }, | ||
| { | ||
| name: 'fetches only accessible resources if cluster does not allow listing all but user preferences says none', | ||
| conditions: { | ||
| isClusterSupportingAccessRequests: true, | ||
| showResources: ShowResources.ACCESSIBLE_ONLY, | ||
| availableResourceModePreference: AvailableResourceMode.NONE, | ||
| }, | ||
| expect: { | ||
| searchAsRoles: false, | ||
| includeRequestable: false, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
||
| test.each(tests)('$name', async testCase => { | ||
| const doc = makeDocumentCluster(); | ||
|
|
||
| const appContext = new MockAppContext({ platform: 'darwin' }); | ||
| appContext.clustersService.setState(draft => { | ||
| draft.clusters.set( | ||
| doc.clusterUri, | ||
| makeRootCluster({ | ||
| uri: doc.clusterUri, | ||
| features: { | ||
| advancedAccessWorkflows: | ||
| testCase.conditions.isClusterSupportingAccessRequests, | ||
| isUsageBasedBilling: false, | ||
| }, | ||
| showResources: testCase.conditions.showResources, | ||
| }) | ||
| ); | ||
| }); | ||
|
|
||
| appContext.workspacesService.setState(draftState => { | ||
| const rootClusterUri = doc.clusterUri; | ||
| draftState.rootClusterUri = rootClusterUri; | ||
| draftState.workspaces[rootClusterUri] = { | ||
| localClusterUri: doc.clusterUri, | ||
| documents: [doc], | ||
| location: doc.uri, | ||
| unifiedResourcePreferences: { | ||
| defaultTab: DefaultTab.ALL, | ||
| viewMode: ViewMode.CARD, | ||
| labelsViewMode: LabelsViewMode.COLLAPSED, | ||
| availableResourceMode: | ||
| testCase.conditions.availableResourceModePreference, | ||
| }, | ||
| accessRequests: { | ||
| pending: getEmptyPendingAccessRequest(), | ||
| isBarCollapsed: true, | ||
| }, | ||
| }; | ||
| }); | ||
|
|
||
| jest.spyOn(appContext.tshd, 'getUserPreferences').mockResolvedValue( | ||
| new MockedUnaryCall({ | ||
| userPreferences: { | ||
| unifiedResourcePreferences: { | ||
| defaultTab: DefaultTab.ALL, | ||
| viewMode: ViewMode.CARD, | ||
| labelsViewMode: LabelsViewMode.COLLAPSED, | ||
| availableResourceMode: | ||
| testCase.conditions.availableResourceModePreference, | ||
| }, | ||
| }, | ||
| }) | ||
| ); | ||
|
|
||
| jest | ||
| .spyOn(appContext.resourcesService, 'listUnifiedResources') | ||
| .mockResolvedValue({ | ||
| resources: [], | ||
| nextKey: '', | ||
| }); | ||
|
|
||
| render( | ||
| <MockAppContextProvider appContext={appContext}> | ||
| <MockWorkspaceContextProvider> | ||
| <ResourcesContextProvider> | ||
| <ConnectMyComputerContextProvider rootClusterUri={doc.clusterUri}> | ||
| <UnifiedResources | ||
| clusterUri={doc.clusterUri} | ||
| docUri={doc.uri} | ||
| queryParams={doc.queryParams} | ||
| /> | ||
| </ConnectMyComputerContextProvider> | ||
| </ResourcesContextProvider> | ||
| </MockWorkspaceContextProvider> | ||
| </MockAppContextProvider> | ||
| ); | ||
|
|
||
| act(mio.enterAll); | ||
|
|
||
| await expect( | ||
| screen.findByText('Add your first resource to Teleport') | ||
| ).resolves.toBeInTheDocument(); | ||
|
|
||
| expect(appContext.resourcesService.listUnifiedResources).toHaveBeenCalledWith( | ||
| { | ||
| clusterUri: rootClusterUri, | ||
| includeRequestable: testCase.expect.includeRequestable, | ||
| kinds: [], | ||
| limit: 48, | ||
| pinnedOnly: false, | ||
| query: '', | ||
| search: '', | ||
| searchAsRoles: testCase.expect.searchAsRoles, | ||
| sortBy: { | ||
| field: 'name', | ||
| isDesc: false, | ||
| }, | ||
| startKey: '', | ||
| }, | ||
| new AbortController().signal | ||
| ); | ||
| }); |
Oops, something went wrong.