Skip to content
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

Prevent activation of previous workspace when launching Connect via deep link to a different cluster #50063

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Prevent activation of previous workspace when launching Connect via deep link to a different cluster #50063

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
51c37e9
Refactor `setActiveWorkspace` to async/await
gzdunek Dec 10, 2024
f43b0ae
Keep all the logic that restores a single workspace state in `getWork…
gzdunek Dec 10, 2024
dc70bdf
Separate restoring state from setting active workspace
gzdunek Dec 10, 2024
a6bb953
Allow the dialog to reopen documents to be closed without any decision
gzdunek Dec 11, 2024
e941385
Add a test that verifies if the correct workspace is activated
gzdunek Dec 11, 2024
9fc2003
Docs improvements
gzdunek Dec 13, 2024
cc2644a
Return early if there's no restoredWorkspace
gzdunek Dec 13, 2024
3dde323
Fix logger name
gzdunek Dec 13, 2024
8c4dbec
Improve test name
gzdunek Dec 13, 2024
8776788
Make restored state immutable
gzdunek Dec 16, 2024
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
100 changes: 44 additions & 56 deletions web/packages/teleterm/src/ui/services/workspacesService/workspacesService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,23 +300,11 @@ export class WorkspacesService extends ImmutableStore<WorkspacesState> {
*/
isAtDesiredWorkspace: boolean;
}> {
const setWorkspace = () => {
this.setState(draftState => {
// adding a new workspace
if (!draftState.workspaces[clusterUri]) {
draftState.workspaces[clusterUri] =
this.getWorkspaceDefaultState(clusterUri);
}
draftState.rootClusterUri = clusterUri;
});
};
gzdunek marked this conversation as resolved.
Show resolved Hide resolved

// empty cluster URI - no cluster selected
if (!clusterUri) {
this.setState(draftState => {
draftState.rootClusterUri = undefined;
});
return Promise.resolve({ isAtDesiredWorkspace: true });
return { isAtDesiredWorkspace: true };
}

let cluster = this.clustersService.findCluster(clusterUri);
Expand All @@ -328,7 +316,7 @@ export class WorkspacesService extends ImmutableStore<WorkspacesState> {
this.logger.warn(
`Could not find cluster with uri ${clusterUri} when changing active cluster`
);
return Promise.resolve({ isAtDesiredWorkspace: false });
return { isAtDesiredWorkspace: false };
}

if (cluster.profileStatusError) {
Expand All @@ -353,51 +341,51 @@ export class WorkspacesService extends ImmutableStore<WorkspacesState> {
}
}

return new Promise<void>((resolve, reject) => {
if (cluster.connected) {
setWorkspace();
return resolve();
if (!cluster.connected) {
const connected = await new Promise<boolean>(resolve =>
this.modalsService.openRegularDialog({
kind: 'cluster-connect',
clusterUri,
reason: undefined,
prefill,
onCancel: () => resolve(false),
onSuccess: () => resolve(true),
})
);
if (!connected) {
return { isAtDesiredWorkspace: false };
}
}
// If we don't have a workspace for this cluster, add it.
this.setState(draftState => {
if (!draftState.workspaces[clusterUri]) {
draftState.workspaces[clusterUri] =
this.getWorkspaceDefaultState(clusterUri);
}
draftState.rootClusterUri = clusterUri;
});

const previousWorkspaceState = this.getWorkspace(clusterUri)?.previous;
if (!previousWorkspaceState) {
return { isAtDesiredWorkspace: true };
}

const reopen = await new Promise<boolean>(resolve =>
this.modalsService.openRegularDialog({
kind: 'cluster-connect',
clusterUri,
reason: undefined,
prefill,
onCancel: () => {
reject();
},
onSuccess: () => {
setWorkspace();
resolve();
},
});
}).then(
() => {
return new Promise<{ isAtDesiredWorkspace: boolean }>(resolve => {
const previousWorkspaceState =
this.getWorkspace(clusterUri)?.previous;
if (!previousWorkspaceState) {
return resolve({ isAtDesiredWorkspace: true });
}
const numberOfDocuments = previousWorkspaceState.documents.length;

this.modalsService.openRegularDialog({
kind: 'documents-reopen',
rootClusterUri: clusterUri,
numberOfDocuments,
onConfirm: () => {
this.reopenPreviousDocuments(clusterUri);
resolve({ isAtDesiredWorkspace: true });
},
onCancel: () => {
this.discardPreviousDocuments(clusterUri);
resolve({ isAtDesiredWorkspace: true });
},
});
});
},
() => ({ isAtDesiredWorkspace: false }) // catch ClusterConnectDialog cancellation
kind: 'documents-reopen',
rootClusterUri: clusterUri,
numberOfDocuments: previousWorkspaceState.documents.length,
onConfirm: () => resolve(true),
onCancel: () => resolve(false),
})
);
if (reopen) {
this.reopenPreviousDocuments(clusterUri);
} else {
this.discardPreviousDocuments(clusterUri);
}

return { isAtDesiredWorkspace: true };
}

removeWorkspace(clusterUri: RootClusterUri): void {
Expand Down