Skip to content

Store profile color in workspace #51417

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
gzdunek merged 9 commits into from
Jan 30, 2025
Merged

Store profile color in workspace #51417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2033386
Adjust workspace tests to accept persisted workspace type
gzdunek Jan 22, 2025
97b463a
Store profile color in workspace
gzdunek Jan 22, 2025
849b95e
Replace manual workspace creation in stories/tests with `addRootClust…
gzdunek Jan 22, 2025
88461e2
Fix checking if all colors are taken
gzdunek Jan 27, 2025
1af2d86
Add DELETE IN comment
gzdunek Jan 27, 2025
9bf6719
`ProfileColor` -> `WorkspaceColor`
gzdunek Jan 27, 2025
f702746
Lint
gzdunek Jan 27, 2025
abd5686
Prettier
gzdunek Jan 27, 2025
b50981d
Add TODO about creating workspaces in `setActiveWorkspace`
gzdunek Jan 27, 2025
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
14 changes: 14 additions & 0 deletions web/packages/build/jest/jest-environment-patched-jsdom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,20 @@ export default class PatchedJSDOMEnvironment extends JSDOMEnvironment {
global.AbortSignal = AbortSignal;
global.AbortController = AbortController;
}
// TODO(gzdunek): Remove when JSDOM supports Set.prototype.difference.
// After the update to Node.js 22, we can replace the implementation with
// global.Set.prototype.difference = Set.prototype.difference.
if (!global.Set.difference) {
global.Set.prototype.difference = function (otherSet) {
const result = new Set();
for (const value of this) {
if (!otherSet.has(value)) {
result.add(value);
}
}
return result;
};
}
}
}
export const TestEnvironment = PatchedJSDOMEnvironment;
10 changes: 1 addition & 9 deletions web/packages/teleterm/src/ui/AccessRequestCheckout/useAssumedRolesBar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,7 @@ import { useAssumedRolesBar } from './useAssumedRolesBar';
test('dropping a request refreshes resources', async () => {
const appContext = new MockAppContext();
const cluster = makeRootCluster();
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = cluster.uri;
draftState.workspaces[cluster.uri] = {
localClusterUri: cluster.uri,
documents: [],
location: undefined,
accessRequests: undefined,
};
});
appContext.addRootCluster(cluster);
Comment thread
gzdunek marked this conversation as resolved.
jest.spyOn(appContext.clustersService, 'dropRoles');
const refreshListener = jest.fn();

Expand Down
3 changes: 2 additions & 1 deletion web/packages/teleterm/src/ui/ClusterConnect/ClusterAdd/ClusterAdd.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@ export function ClusterAdd(props: {
onSuccess(clusterUri: string): void;
prefill: { clusterAddress: string };
}) {
const { clustersService } = useAppContext();
const { clustersService, workspacesService } = useAppContext();
const [{ status, statusText }, addCluster] = useAsync(
async (addr: string) => {
const proxyAddr = parseClusterProxyWebAddr(addr);
const cluster = await clustersService.addRootCluster(proxyAddr);
workspacesService.addWorkspace(cluster.uri);
Comment thread
gzdunek marked this conversation as resolved.
return props.onSuccess(cluster.uri);
}
);
Expand Down
14 changes: 2 additions & 12 deletions web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesC
import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
import { IAppContext } from 'teleterm/ui/types';

import { ConnectMyComputerContextProvider } from '../connectMyComputerContext';
import { Setup } from './Setup';
Expand Down Expand Up @@ -153,20 +152,11 @@ function ShowState({
clickStartSetup = true,
}: {
cluster: Cluster;
appContext: IAppContext;
appContext: MockAppContext;
clickStartSetup?: boolean;
}) {
if (!appContext.clustersService.state.clusters.get(cluster.uri)) {
appContext.clustersService.state.clusters.set(cluster.uri, cluster);
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = cluster.uri;
draftState.workspaces[cluster.uri] = {
localClusterUri: cluster.uri,
documents: [],
location: undefined,
accessRequests: undefined,
};
});
appContext.addRootCluster(cluster);
}

useLayoutEffect(() => {
Expand Down
11 changes: 1 addition & 10 deletions web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Setup.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,7 @@ function setupAppContext(): {
const appContext = new MockAppContext({
appVersion: cluster.proxyVersion,
});
appContext.clustersService.state.clusters.set(cluster.uri, cluster);
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = cluster.uri;
draftState.workspaces[cluster.uri] = {
localClusterUri: cluster.uri,
documents: [],
location: undefined,
accessRequests: undefined,
};
});
appContext.addRootCluster(cluster);

jest
.spyOn(appContext.mainProcessClient, 'isAgentConfigFileCreated')
Expand Down
16 changes: 2 additions & 14 deletions web/packages/teleterm/src/ui/ConnectMyComputer/DocumentConnectMyComputer/Status.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import {
makeRootCluster,
makeServer,
} from 'teleterm/services/tshd/testHelpers';
import AppContext from 'teleterm/ui/appContext';
import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesContext';
import { MockAppContextProvider } from 'teleterm/ui/fixtures/MockAppContextProvider';
import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
Expand Down Expand Up @@ -236,7 +235,7 @@ export function UpgradeAgentSuggestion() {

function ShowState(props: {
agentProcessState: AgentProcessState;
appContext?: AppContext;
appContext?: MockAppContext;
proxyVersion?: string;
autoStart?: boolean;
}) {
Expand All @@ -248,18 +247,7 @@ function ShowState(props: {
new MockAppContext({ appVersion: cluster.proxyVersion });

appContext.mainProcessClient.getAgentState = () => props.agentProcessState;
appContext.clustersService.state.clusters.set(cluster.uri, cluster);
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = cluster.uri;
draftState.workspaces = {
[cluster.uri]: {
localClusterUri: cluster.uri,
documents: [],
location: '/docs/1234',
accessRequests: undefined,
},
};
});
appContext.addRootCluster(cluster);

if (props.autoStart) {
appContext.workspacesService.setConnectMyComputerAutoStart(
Expand Down
13 changes: 2 additions & 11 deletions web/packages/teleterm/src/ui/ConnectMyComputer/NavigationMenu.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default {
title: 'Teleterm/ConnectMyComputer/NavigationMenu',
};

export function AgenNotConfigured() {
export function AgentNotConfigured() {
return (
<ShowState
agentProcessState={{ status: 'not-started' }}
Expand Down Expand Up @@ -161,16 +161,7 @@ function ShowState({
const cluster = makeRootCluster({
proxyVersion: '17.0.0',
});
appContext.clustersService.state.clusters.set(cluster.uri, cluster);
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = cluster.uri;
draftState.workspaces[cluster.uri] = {
localClusterUri: cluster.uri,
documents: [],
location: undefined,
accessRequests: undefined,
};
});
appContext.addRootCluster(cluster);

appContext.mainProcessClient.getAgentState = () => agentProcessState;
appContext.connectMyComputerService.isAgentConfigFileCreated =
Expand Down
14 changes: 1 addition & 13 deletions web/packages/teleterm/src/ui/ConnectMyComputer/connectMyComputerContext.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,7 @@ function getMocks() {
const appContext = new MockAppContext({
appVersion: rootCluster.proxyVersion,
});

appContext.clustersService.setState(draftState => {
draftState.clusters.set(rootCluster.uri, rootCluster);
});
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = rootCluster.uri;
draftState.workspaces[rootCluster.uri] = {
documents: [],
location: undefined,
localClusterUri: rootCluster.uri,
accessRequests: undefined,
};
});
appContext.addRootCluster(rootCluster);

return { appContext, rootCluster };
}
Expand Down
72 changes: 12 additions & 60 deletions web/packages/teleterm/src/ui/DocumentAccessRequests/DocumentAccessRequests.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { ResourcesContextProvider } from 'teleterm/ui/DocumentCluster/resourcesC
import { MockAppContext } from 'teleterm/ui/fixtures/mocks';
import { MockWorkspaceContextProvider } from 'teleterm/ui/fixtures/MockWorkspaceContextProvider';
import * as types from 'teleterm/ui/services/workspacesService';
import { getEmptyPendingAccessRequest } from 'teleterm/ui/services/workspacesService/accessRequestsService';

const rootCluster = makeRootCluster();

Expand Down Expand Up @@ -89,18 +88,7 @@ export function Browsing() {
startKey: '',
requests: [mockedAccessRequest],
});
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = rootCluster.uri;
draftState.workspaces[rootCluster.uri] = {
localClusterUri: doc.clusterUri,
documents: [doc],
location: doc.uri,
accessRequests: {
pending: getEmptyPendingAccessRequest(),
isBarCollapsed: true,
},
};
});
appContext.addRootClusterWithDoc(rootCluster, [doc]);

return (
<AppContextProvider value={appContext}>
Expand All @@ -117,21 +105,7 @@ export function BrowsingError() {
const appContext = new MockAppContext();
appContext.tshd.getAccessRequests = () =>
new MockedUnaryCall(null, new Error('network error'));
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = rootCluster.uri;
draftState.workspaces[rootCluster.uri] = {
localClusterUri: doc.clusterUri,
documents: [doc],
location: doc.uri,
accessRequests: {
pending: getEmptyPendingAccessRequest(),
isBarCollapsed: true,
},
};
});
appContext.clustersService.setState(draftState => {
draftState.clusters.set(rootCluster.uri, rootCluster);
});
appContext.addRootClusterWithDoc(rootCluster, [doc]);

return (
<AppContextProvider value={appContext}>
Expand All @@ -156,24 +130,13 @@ export function CreatingWhenUnifiedResourcesShowOnlyAccessibleResources() {
startKey: '',
requests: [mockedAccessRequest],
});
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = rootCluster.uri;
draftState.workspaces[rootCluster.uri] = {
localClusterUri: docCreating.clusterUri,
documents: [docCreating],
location: docCreating.uri,
accessRequests: {
pending: getEmptyPendingAccessRequest(),
isBarCollapsed: true,
},
};
});
appContext.clustersService.setState(draftState => {
draftState.clusters.set(rootCluster.uri, {
appContext.addRootClusterWithDoc(
{
...rootCluster,
showResources: ShowResources.ACCESSIBLE_ONLY,
});
});
},
[doc]
);

return (
<AppContextProvider value={appContext}>
Expand All @@ -198,24 +161,13 @@ export function CreatingWhenUnifiedResourcesShowRequestableAndAccessibleResource
startKey: '',
requests: [mockedAccessRequest],
});
appContext.workspacesService.setState(draftState => {
draftState.rootClusterUri = rootCluster.uri;
draftState.workspaces[rootCluster.uri] = {
localClusterUri: docCreating.clusterUri,
documents: [docCreating],
location: docCreating.uri,
accessRequests: {
pending: getEmptyPendingAccessRequest(),
isBarCollapsed: true,
},
};
});
appContext.clustersService.setState(draftState => {
draftState.clusters.set(rootCluster.uri, {
appContext.addRootClusterWithDoc(
{
...rootCluster,
showResources: ShowResources.REQUESTABLE,
});
});
},
[doc]
);

return (
<AppContextProvider value={appContext}>
Expand Down
12 changes: 1 addition & 11 deletions ...packages/teleterm/src/ui/DocumentAuthorizeWebSession/DocumentAuthorizeWebSession.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,7 @@ test('authorizing a session opens its URL and closes document', async () => {
loggedInUser: makeLoggedInUser({ isDeviceTrusted: true }),
});
const appContext = new MockAppContext();
appContext.clustersService.setState(draftState => {
draftState.clusters.set(rootCluster.uri, rootCluster);
});
appContext.workspacesService.setState(draftState => {
draftState.workspaces[rootCluster.uri] = {
localClusterUri: rootCluster.uri,
documents: [doc],
location: undefined,
accessRequests: undefined,
};
});
appContext.addRootClusterWithDoc(rootCluster, doc);

render(
<MockAppContextProvider appContext={appContext}>
Expand Down
Loading