development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-19 10:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only show "Not Forwarded" when auto forward is disabled

Browse source 
Part of microsoft/vscode-remote-release#4021
This commit is contained in:
Alex Ross 2020-11-26 16:22:17 +01:00
parent 58fe1b9dfa
commit e5111fc439
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
View file

@ -7,7 +7,7 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { Extensions, IViewContainersRegistry, IViewDescriptorService, IViewsRegistry, IViewsService, ViewContainerLocation } from 'vs/workbench/common/views';
import { IRemoteExplorerService, makeAddress, mapHasAddressLocalhostOrAllInterfaces, TUNNEL_VIEW_ID } from 'vs/workbench/services/remote/common/remoteExplorerService';
import { forwardedPortsViewEnabled, ForwardPortAction, OpenPortInBrowserAction, TunnelPanel, TunnelPanelDescriptor, TunnelViewModel } from 'vs/workbench/contrib/remote/browser/tunnelView';
import { PORT_AUTO_FORWARD_SETTING, forwardedPortsViewEnabled, ForwardPortAction, OpenPortInBrowserAction, TunnelPanel, TunnelPanelDescriptor, TunnelViewModel } from 'vs/workbench/contrib/remote/browser/tunnelView';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { Registry } from 'vs/platform/registry/common/platform';
@ -40,7 +40,8 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService,
@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
@IActivityService private readonly activityService: IActivityService,
@IStatusbarService private readonly statusbarService: IStatusbarService
@IStatusbarService private readonly statusbarService: IStatusbarService,
@IConfigurationService private readonly configurationService: IConfigurationService
) {
super();
this._register(Registry.as<IViewsRegistry>(Extensions.ViewsRegistry).registerViewWelcomeContent(TUNNEL_VIEW_ID, {
@ -68,7 +69,7 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
order: 5
}, ViewContainerLocation.Panel);
const tunnelPanelDescriptor = new TunnelPanelDescriptor(new TunnelViewModel(this.remoteExplorerService), this.environmentService);
const tunnelPanelDescriptor = new TunnelPanelDescriptor(new TunnelViewModel(this.remoteExplorerService, this.configurationService), this.environmentService);
const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
if (viewContainer) {
viewsRegistry.registerViews([tunnelPanelDescriptor!], viewContainer);
@ -147,7 +148,6 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
export class AutomaticPortForwarding extends Disposable implements IWorkbenchContribution {
static AUTO_FORWARD_SETTING = 'remote.autoForwardPorts';
constructor(
@ITerminalService readonly terminalService: ITerminalService,
@ -234,7 +234,7 @@ class WindowsAutomaticPortForwarding extends Disposable {
super();
this.notifier = new ForwardedPortNotifier(notificationService, remoteExplorerService, openerService);
this._register(configurationService.onDidChangeConfiguration((e) => {
if (e.affectsConfiguration(AutomaticPortForwarding.AUTO_FORWARD_SETTING)) {
if (e.affectsConfiguration(PORT_AUTO_FORWARD_SETTING)) {
this.tryStartStopUrlFinder();
}
}));
@ -248,7 +248,7 @@ class WindowsAutomaticPortForwarding extends Disposable {
}
private tryStartStopUrlFinder() {
if (this.configurationService.getValue(AutomaticPortForwarding.AUTO_FORWARD_SETTING)) {
if (this.configurationService.getValue(PORT_AUTO_FORWARD_SETTING)) {
this.startUrlFinder();
} else {
this.stopUrlFinder();
@ -297,7 +297,7 @@ class LinuxAutomaticPortForwarding extends Disposable {
super();
this.notifier = new ForwardedPortNotifier(notificationService, remoteExplorerService, openerService);
this._register(configurationService.onDidChangeConfiguration((e) => {
if (e.affectsConfiguration(AutomaticPortForwarding.AUTO_FORWARD_SETTING)) {
if (e.affectsConfiguration(PORT_AUTO_FORWARD_SETTING)) {
this.startStopCandidateListener();
}
}));
@ -306,7 +306,7 @@ class LinuxAutomaticPortForwarding extends Disposable {
}
private startStopCandidateListener() {
if (this.configurationService.getValue(AutomaticPortForwarding.AUTO_FORWARD_SETTING)) {
if (this.configurationService.getValue(PORT_AUTO_FORWARD_SETTING)) {
this.startCandidateListener();
} else {
this.stopCandidateListener();

20
src/vs/workbench/contrib/remote/browser/tunnelView.ts
View file

@ -45,6 +45,7 @@ import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
import { Codicon } from 'vs/base/common/codicons';
export const forwardedPortsViewEnabled = new RawContextKey<boolean>('forwardedPortsViewEnabled', false);
export const PORT_AUTO_FORWARD_SETTING = 'remote.autoForwardPorts';
class TunnelTreeVirtualDelegate implements IListVirtualDelegate<ITunnelItem> {
getHeight(element: ITunnelItem): number {
@ -73,7 +74,8 @@ export class TunnelViewModel extends Disposable implements ITunnelViewModel {
private _candidates: Map<string, { host: string, port: number, detail: string }> = new Map();
constructor(
@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService) {
@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService,
@IConfigurationService private readonly configurationService: IConfigurationService) {
super();
this.model = remoteExplorerService.tunnelModel;
this._register(this.model.onForwardPort(() => this._onForwardedPortsChanged.fire()));
@ -106,13 +108,15 @@ export class TunnelViewModel extends Disposable implements ITunnelViewModel {
items: this.detected
});
}
const candidates = await this.candidates;
if (candidates.length > 0) {
groups.push({
label: nls.localize('remote.tunnelsView.candidates', "Not Forwarded"),
tunnelType: TunnelType.Candidate,
items: candidates
});
if (!this.configurationService.getValue(PORT_AUTO_FORWARD_SETTING)) {
const candidates = await this.candidates;
if (candidates.length > 0) {
groups.push({
label: nls.localize('remote.tunnelsView.candidates', "Not Forwarded"),
tunnelType: TunnelType.Candidate,
items: candidates
});
}
}
if (groups.length === 0) {
groups.push(this._input);