Skip to content

[v14] Add Connect My Computer tile to Discover #34287

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 10 commits into from
Nov 8, 2023
Merged

[v14] Add Connect My Computer tile to Discover #34287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
87da54e
Use JSDoc for SelectResource types
ravicious Oct 30, 2023
401742f
Add Connect My Computer tile
ravicious Oct 30, 2023
27e200f
Hide Connect My Computer tile from Windows users
ravicious Oct 30, 2023
b7c191b
Hide Connect My Computer tile from SSO users
ravicious Oct 30, 2023
4e90be7
sortResources: Move away from using -1/1
ravicious Oct 31, 2023
7a61030
Use comparePredicate to avoid repeated conditionals
ravicious Oct 31, 2023
3d1b526
Sort Connect My Computer tile
ravicious Oct 31, 2023
b417036
Fix typo in a comment
ravicious Nov 7, 2023
a398dc0
Slightly reword description of how onboardDiscover interacts with Con…
ravicious Nov 7, 2023
26f56bd
Disable Connect My Computer tile
ravicious Nov 7, 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
310 changes: 310 additions & 0 deletions web/packages/design/src/ResourceIcon/assets/laptop.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions web/packages/design/src/ResourceIcon/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import gcp from './assets/gcp.svg';
import grafana from './assets/grafana.svg';
import jenkins from './assets/jenkins.svg';
import kube from './assets/kube.svg';
import laptop from './assets/laptop.svg';
import linuxDark from './assets/linux-dark.svg';
import linuxLight from './assets/linux-light.svg';
import mongoDark from './assets/mongo-dark.svg';
Expand Down Expand Up @@ -91,6 +92,7 @@ const iconSpecs = {
Grafana: forAllThemes(grafana),
Jenkins: forAllThemes(jenkins),
Kube: forAllThemes(kube),
Laptop: forAllThemes(laptop),
Linux: { dark: linuxDark, light: linuxLight },
Mongo: { dark: mongoDark, light: mongoLight },
MysqlLarge: { dark: mysqlLargeDark, light: mysqlLargeLight },
Expand Down
22 changes: 16 additions & 6 deletions web/packages/teleport/src/Discover/Discover.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,18 @@ import { makeDefaultUserPreferences } from 'teleport/services/userPreferences/us

import { ResourceKind } from './Shared';

beforeEach(() => {
jest.restoreAllMocks();
});

type createProps = {
initialEntry?: string;
preferredResource?: ClusterResource;
};

const create = ({ initialEntry = '', preferredResource }: createProps) => {
jest.spyOn(window.navigator, 'userAgent', 'get').mockReturnValue('Macintosh');

const defaultPref = makeDefaultUserPreferences();
defaultPref.onboard.preferredResources = preferredResource
? [preferredResource]
Expand Down Expand Up @@ -83,9 +89,11 @@ const create = ({ initialEntry = '', preferredResource }: createProps) => {
test('displays all resources by default', () => {
create({});

expect(screen.getAllByTestId(ResourceKind.Server)).toHaveLength(
SERVERS.length
);
expect(
screen.getAllByTestId(ResourceKind.Server)
// TODO(ravicious): Uncomment for v14.2.
// .concat(screen.getAllByTestId(ResourceKind.ConnectMyComputer))
).toHaveLength(SERVERS.length);
expect(screen.getAllByTestId(ResourceKind.Desktop)).toHaveLength(
WINDOWS_DESKTOPS.length
);
Expand Down Expand Up @@ -122,9 +130,11 @@ describe('location state', () => {
test('displays servers when the location state is server', () => {
create({ initialEntry: 'server' });

expect(screen.getAllByTestId(ResourceKind.Server)).toHaveLength(
SERVERS.length
);
expect(
screen.getAllByTestId(ResourceKind.Server)
// TODO(ravicious): Uncomment for v14.2.
// .concat(screen.getAllByTestId(ResourceKind.ConnectMyComputer))
).toHaveLength(SERVERS.length);

// we assert three databases for servers because the naming convention includes "server"
expect(screen.queryAllByTestId(ResourceKind.Database)).toHaveLength(3);
Expand Down
Loading