Skip to content

Show Connect My Computer CTA only if versions are compatible #33561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ravicious merged 2 commits into from
Oct 17, 2023
Merged

Show Connect My Computer CTA only if versions are compatible #33561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d5affd
Show Connect My Computer CTA only if versions are compatible
ravicious Oct 17, 2023
5973c3f
Fix DocumentCluster NotFound story by passing correct cluster URI
ravicious Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web/packages/teleterm/src/mainProcess/fixtures/mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export const makeRuntimeSettings = (
installationId: '123e4567-e89b-12d3-a456-426614174000',
arch: 'arm64',
osVersion: '22.2.0',
// Should be kept in sync with the default proxyVersion of makeRootCluster.
appVersion: '11.1.0',
isLocalBuild: runtimeSettings?.appVersion === '1.0.0-dev',
username: 'alice',
Expand Down
2 changes: 1 addition & 1 deletion web/packages/teleterm/src/services/tshd/testHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const makeRootCluster = (
proxyHost: 'teleport-local:3080',
authClusterId: 'fefe3434-fefe-3434-fefe-3434fefe3434',
loggedInUser: makeLoggedInUser(),
proxyVersion: '1.0.0',
proxyVersion: '11.1.0',
...props,
});

Expand Down
10 changes: 10 additions & 0 deletions ...ConnectMyComputer/DocumentConnectMyComputerSetup/DocumentConnectMyComputerSetup.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ export function Success() {
const appContext = new MockAppContext({ appVersion: cluster.proxyVersion });
appContext.connectMyComputerService.waitForNodeToJoin = async () =>
makeServer();
// Report the agent as running so that the autostart behavior doesn't kick in and attempt to start
// the agent over and over.
appContext.mainProcessClient.subscribeToAgentUpdate = (
rootClusterUri,
callback
) => {
callback({ status: 'running' });

return { cleanup: () => {} };
};
return <ShowState cluster={cluster} appContext={appContext} />;
}

Expand Down
8 changes: 6 additions & 2 deletions web/packages/teleterm/src/ui/DocumentCluster/ClusterResources/Servers/Servers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ function ServerList(props: State) {
const { documentsService, rootClusterUri } = useWorkspaceContext();
const { clusterUri } = useClusterContext();
const loggedInUser = useWorkspaceLoggedInUser();
const { canUse: canUseConnectMyComputer } = useConnectMyComputerContext();
const { canUse: hasPermissionsForConnectMyComputer, agentCompatibility } =
useConnectMyComputerContext();

const servers = fetchAttempt.data?.agentsList.map(makeServer) || [];
const disabled = fetchAttempt.status === 'processing';
Expand All @@ -70,13 +71,16 @@ function ServerList(props: State) {
agentFilter.search || agentFilter.query,
canAddResources
);
const canUseConnectMyComputer =
isRootCluster &&
hasPermissionsForConnectMyComputer &&
agentCompatibility === 'compatible';
let { emptyText, emptyHint } = getEmptyTableText(emptyTableStatus, 'servers');
let emptyButton: JSX.Element;

if (
emptyTableStatus.status === 'no-resources' &&
emptyTableStatus.showEnrollingResourcesHint &&
isRootCluster &&
canUseConnectMyComputer
) {
emptyHint =
Expand Down
4 changes: 2 additions & 2 deletions web/packages/teleterm/src/ui/DocumentCluster/DocumentCluster.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ function renderState({
const appContext = new MockAppContext({ platform });
appContext.clustersService.state = state;

const rootClusterUri = routing.ensureRootClusterUri(doc.clusterUri);
appContext.workspacesService.setState(draftState => {
const rootClusterUri = routing.ensureRootClusterUri(doc.clusterUri);
draftState.rootClusterUri = rootClusterUri;
draftState.workspaces[rootClusterUri] = {
localClusterUri: doc.clusterUri,
Expand All @@ -286,7 +286,7 @@ function renderState({
return (
<AppContextProvider value={appContext}>
<MockWorkspaceContextProvider>
<ConnectMyComputerContextProvider rootClusterUri={doc.clusterUri}>
<ConnectMyComputerContextProvider rootClusterUri={rootClusterUri}>
<ResourcesContextProvider>
<Wrapper>
<DocumentCluster visible={true} doc={doc} />
Expand Down