Skip to content

Remove another TunnelItem from a context key #148706

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
alexr00 merged 1 commit into from
May 4, 2022
Merged

Remove another TunnelItem from a context key #148706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 20 additions & 13 deletions src/vs/workbench/contrib/remote/browser/tunnelView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,8 @@ const TunnelViewSelectionKeyName = 'tunnelViewSelection';
// host:port
const TunnelViewSelectionContextKey = new RawContextKey<string | undefined>(TunnelViewSelectionKeyName, undefined, true);
const TunnelViewMultiSelectionKeyName = 'tunnelViewMultiSelection';
const TunnelViewMultiSelectionContextKey = new RawContextKey<ITunnelItem[] | undefined>(TunnelViewMultiSelectionKeyName, undefined, true);
// host:port[]
const TunnelViewMultiSelectionContextKey = new RawContextKey<string[] | undefined>(TunnelViewMultiSelectionKeyName, undefined, true);
const PortChangableContextKey = new RawContextKey<boolean>('portChangable', false, true);
const WebContextKey = new RawContextKey<boolean>('isWeb', isWeb, true);

Expand All @@ -754,7 +755,7 @@ export class TunnelPanel extends ViewPane {
private tunnelProtocolContext: IContextKey<TunnelProtocol | undefined>;
private tunnelViewFocusContext: IContextKey<boolean>;
private tunnelViewSelectionContext: IContextKey<string | undefined>;
private tunnelViewMultiSelectionContext: IContextKey<ITunnelItem[] | undefined>;
private tunnelViewMultiSelectionContext: IContextKey<string[] | undefined>;
private portChangableContextKey: IContextKey<boolean>;
private isEditing: boolean = false;
private titleActions: IAction[] = [];
Expand Down Expand Up @@ -992,7 +993,7 @@ export class TunnelPanel extends ViewPane {
private onSelectionChanged(event: ITableEvent<ITunnelItem>) {
const elements = event.elements;
if (elements.length > 1) {
this.tunnelViewMultiSelectionContext.set(elements);
this.tunnelViewMultiSelectionContext.set(elements.map(element => makeAddress(element.remoteHost, element.remotePort)));
} else {
this.tunnelViewMultiSelectionContext.set(undefined);
}
Expand Down Expand Up @@ -1237,20 +1238,26 @@ namespace ClosePortAction {
return async (accessor, arg) => {
const contextKeyService = accessor.get(IContextKeyService);
const remoteExplorerService = accessor.get(IRemoteExplorerService);

let ports: (ITunnelItem | Tunnel)[] | undefined = contextKeyService.getContextKeyValue<ITunnelItem[] | undefined>(TunnelViewMultiSelectionKeyName);
if (!ports) {
if (isITunnelItem(arg)) {
ports = [arg];
} else {
const context = contextKeyService.getContextKeyValue<string | undefined>(TunnelViewSelectionKeyName);
const tunnel = context ? remoteExplorerService.tunnelModel.forwarded.get(context) : undefined;
let ports: (ITunnelItem | Tunnel)[] = [];
const multiSelectContext = contextKeyService.getContextKeyValue<string[] | undefined>(TunnelViewMultiSelectionKeyName);
if (multiSelectContext) {
multiSelectContext.forEach(context => {
const tunnel = remoteExplorerService.tunnelModel.forwarded.get(context);
if (tunnel) {
ports = [tunnel];
ports?.push(tunnel);
}
});
} else if (isITunnelItem(arg)) {
ports = [arg];
} else {
const context = contextKeyService.getContextKeyValue<string | undefined>(TunnelViewSelectionKeyName);
const tunnel = context ? remoteExplorerService.tunnelModel.forwarded.get(context) : undefined;
if (tunnel) {
ports = [tunnel];
}
}
if (!ports) {

if (!ports || ports.length === 0) {
return;
}
return Promise.all(ports.map(port => remoteExplorerService.close({ host: port.remoteHost, port: port.remotePort })));
Expand Down