Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-28 13:56:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports view no longer shows privacy column/toggle (#191037)

Browse Source 
Fixes #190920
This commit is contained in:
Alex Ross
2023-08-22 16:27:31 -07:00
committed by GitHub
parent 08b4e30259
commit f7ceb0697b
2 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/browser/mainThreadTunnelService.ts
+1 -1
View File
@@ -195,10 +195,10 @@ export class MainThreadTunnelService extends Disposable implements MainThreadTun
});
}
};
this.tunnelService.setTunnelProvider(tunnelProvider);
if (features) {
this.tunnelService.setTunnelFeatures(features);
}
this.tunnelService.setTunnelProvider(tunnelProvider);
// At this point we clearly want the ports view/features since we have a tunnel factory
this.contextKeyService.createKey(forwardedPortsViewEnabled.key, true);
}
src/vs/workbench/contrib/remote/browser/tunnelView.ts
+42 -15
View File
@@ -744,7 +744,9 @@ export class TunnelPanel extends ViewPane {
static readonly ID = TUNNEL_VIEW_ID;
static readonly TITLE = nls.localize('remote.tunnel', "Ports");
private panelContainer: HTMLElement | undefined;
private table!: WorkbenchTable<ITunnelItem>;
private tableDisposables: DisposableStore = this._register(new DisposableStore());
private tunnelTypeContext: IContextKey<TunnelType>;
private tunnelCloseableContext: IContextKey<boolean>;
private tunnelPrivacyContext: IContextKey<TunnelPrivacyId | string | undefined>;
@@ -783,7 +785,7 @@ export class TunnelPanel extends ViewPane {
this.tunnelCloseableContext = TunnelCloseableContextKey.bindTo(contextKeyService);
this.tunnelPrivacyContext = TunnelPrivacyContextKey.bindTo(contextKeyService);
this.tunnelPrivacyEnabledContext = TunnelPrivacyEnabledContextKey.bindTo(contextKeyService);
this.tunnelPrivacyEnabledContext.set(tunnelService.privacyOptions.length !== 0);
this.tunnelPrivacyEnabledContext.set(tunnelService.canChangePrivacy);
this.tunnelProtocolContext = TunnelProtocolContextKey.bindTo(contextKeyService);
this.tunnelViewFocusContext = TunnelViewFocusContextKey.bindTo(contextKeyService);
this.tunnelViewSelectionContext = TunnelViewSelectionContextKey.bindTo(contextKeyService);
@@ -806,6 +808,15 @@ export class TunnelPanel extends ViewPane {
}));
this.registerPrivacyActions();
this._register(Event.once(this.tunnelService.onAddedTunnelProvider)(() => {
if (this.tunnelPrivacyEnabledContext.get() === false) {
this.tunnelPrivacyEnabledContext.set(tunnelService.canChangePrivacy);
updateActions();
this.registerPrivacyActions();
this.createTable();
this.table.layout(this.height, this.width);
}
}));
}
private registerPrivacyActions() {
@@ -827,11 +838,15 @@ export class TunnelPanel extends ViewPane {
return this.remoteExplorerService.tunnelModel.forwarded.size + this.remoteExplorerService.tunnelModel.detected.size;
}
protected override renderBody(container: HTMLElement): void {
super.renderBody(container);
private createTable(): void {
if (!this.panelContainer) {
return;
}
this.tableDisposables.clear();
const panelContainer = dom.append(container, dom.$('.tree-explorer-viewlet-tree-view'));
const widgetContainer = dom.append(panelContainer, dom.$('.customview-tree'));
dom.clearNode(this.panelContainer);
const widgetContainer = dom.append(this.panelContainer, dom.$('.customview-tree'));
widgetContainer.classList.add('ports-view');
widgetContainer.classList.add('file-icon-themable-tree', 'show-file-icons');
@@ -874,18 +889,19 @@ export class TunnelPanel extends ViewPane {
const actionRunner: ActionRunner = new ActionRunner();
actionBarRenderer.actionRunner = actionRunner;
this._register(this.table.onContextMenu(e => this.onContextMenu(e, actionRunner)));
this._register(this.table.onMouseDblClick(e => this.onMouseDblClick(e)));
this._register(this.table.onDidChangeFocus(e => this.onFocusChanged(e)));
this._register(this.table.onDidChangeSelection(e => this.onSelectionChanged(e)));
this._register(this.table.onDidFocus(() => this.tunnelViewFocusContext.set(true)));
this._register(this.table.onDidBlur(() => this.tunnelViewFocusContext.set(false)));
this.tableDisposables.add(this.table);
this.tableDisposables.add(this.table.onContextMenu(e => this.onContextMenu(e, actionRunner)));
this.tableDisposables.add(this.table.onMouseDblClick(e => this.onMouseDblClick(e)));
this.tableDisposables.add(this.table.onDidChangeFocus(e => this.onFocusChanged(e)));
this.tableDisposables.add(this.table.onDidChangeSelection(e => this.onSelectionChanged(e)));
this.tableDisposables.add(this.table.onDidFocus(() => this.tunnelViewFocusContext.set(true)));
this.tableDisposables.add(this.table.onDidBlur(() => this.tunnelViewFocusContext.set(false)));
const rerender = () => this.table.splice(0, Number.POSITIVE_INFINITY, this.viewModel.all);
rerender();
let lastPortCount = this.portCount;
this._register(Event.debounce(this.viewModel.onForwardedPortsChanged, (_last, e) => e, 50)(() => {
this.tableDisposables.add(Event.debounce(this.viewModel.onForwardedPortsChanged, (_last, e) => e, 50)(() => {
const newPortCount = this.portCount;
if (((lastPortCount === 0) || (newPortCount === 0)) && (lastPortCount !== newPortCount)) {
this._onDidChangeViewWelcomeState.fire();
@@ -894,7 +910,7 @@ export class TunnelPanel extends ViewPane {
rerender();
}));
this._register(this.table.onMouseClick(e => {
this.tableDisposables.add(this.table.onMouseClick(e => {
if (this.hasOpenLinkModifier(e.browserEvent)) {
const selection = this.table.getSelectedElements();
if ((selection.length === 0) ||
@@ -904,7 +920,7 @@ export class TunnelPanel extends ViewPane {
}
}));
this._register(this.table.onDidOpen(e => {
this.tableDisposables.add(this.table.onDidOpen(e => {
if (!e.element || (e.element.tunnelType !== TunnelType.Forwarded)) {
return;
}
@@ -913,7 +929,7 @@ export class TunnelPanel extends ViewPane {
}
}));
this._register(this.remoteExplorerService.onDidChangeEditable(e => {
this.tableDisposables.add(this.remoteExplorerService.onDidChangeEditable(e => {
this.isEditing = !!this.remoteExplorerService.getEditableData(e?.tunnel, e?.editId);
this._onDidChangeViewWelcomeState.fire();
@@ -938,6 +954,13 @@ export class TunnelPanel extends ViewPane {
}));
}
protected override renderBody(container: HTMLElement): void {
super.renderBody(container);
this.panelContainer = dom.append(container, dom.$('.tree-explorer-viewlet-tree-view'));
this.createTable();
}
override shouldShowWelcome(): boolean {
return this.viewModel.isEmpty() && !this.isEditing;
}
@@ -1048,7 +1071,11 @@ export class TunnelPanel extends ViewPane {
}
}
private height = 0;
private width = 0;
protected override layoutBody(height: number, width: number): void {
this.height = height;
this.width = width;
super.layoutBody(height, width);
this.table.layout(height, width);
}