@theia/remote 1.51.0 → 1.53.0-next.55

package/src/electron-browser/port-forwarding/port-forwarding-widget.tsx

@@ -1,140 +1,140 @@
-// *****************************************************************************
-// Copyright (C) 2024 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as React from '@theia/core/shared/react';
-import { ReactNode } from '@theia/core/shared/react';
-import { OpenerService, ReactWidget } from '@theia/core/lib/browser';
-import { nls, URI } from '@theia/core';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { ForwardedPort, PortForwardingService } from './port-forwarding-service';
-import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
-
-export const PORT_FORWARDING_WIDGET_ID = 'port-forwarding-widget';
-
-@injectable()
-export class PortForwardingWidget extends ReactWidget {
-
-    @inject(PortForwardingService)
-    protected readonly portForwardingService: PortForwardingService;
-
-    @inject(OpenerService)
-    protected readonly openerService: OpenerService;
-
-    @inject(ClipboardService)
-    protected readonly clipboardService: ClipboardService;
-
-    @postConstruct()
-    protected init(): void {
-        this.id = PORT_FORWARDING_WIDGET_ID;
-        this.node.tabIndex = -1;
-        this.title.label = nls.localizeByDefault('Ports');
-        this.title.caption = this.title.label;
-        this.title.closable = true;
-        this.update();
-
-        this.portForwardingService.onDidChangePorts(() => this.update());
-    }
-
-    protected render(): ReactNode {
-        if (this.portForwardingService.forwardedPorts.length === 0) {
-            return <div>
-                <p style={{ marginLeft: 'calc(var(--theia-ui-padding) * 2)' }}>
-                    {nls.localizeByDefault('No forwarded ports. Forward a port to access your locally running services over the internet.\n[Forward a Port]({0})').split('\n')[0]}
-                </p>
-                {this.renderForwardPortButton()}
-            </div>;
-        }
-
-        return <div>
-            <table className='port-table'>
-                <thead>
-                    <tr>
-                        <th className='port-table-header'>{nls.localizeByDefault('Port')}</th>
-                        <th className='port-table-header'>{nls.localizeByDefault('Address')}</th>
-                        <th className='port-table-header'>{nls.localizeByDefault('Running Process')}</th>
-                        <th className='port-table-header'>{nls.localizeByDefault('Origin')}</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {this.portForwardingService.forwardedPorts.map(port => (
-                        <tr key={port.localPort ?? 'editing'}>
-                            {this.renderPortColumn(port)}
-                            {this.renderAddressColumn(port)}
-                            <td></td>
-                            <td>{port.origin ? nls.localizeByDefault(port.origin) : ''}</td>
-                        </tr>
-                    ))}
-                    {!this.portForwardingService.forwardedPorts.some(port => port.editing) && <tr><td>{this.renderForwardPortButton()}</td></tr>}
-                </tbody>
-            </table>
-        </div>;
-    }
-
-    protected renderForwardPortButton(): ReactNode {
-        return <button className='theia-button' onClick={() => {
-            this.portForwardingService.forwardNewPort('User Forwarded');
-            this.update();
-        }
-        }>{nls.localizeByDefault('Forward a Port')}</button>;
-    }
-
-    protected renderAddressColumn(port: ForwardedPort): ReactNode {
-        const address = `${port.address ?? '0.0.0.0'}:${port.localPort}`;
-        return <td>
-            <div className='button-cell'>
-                <span style={{ flexGrow: 1 }} className='forwarded-address' onClick={async e => {
-                    if (e.ctrlKey) {
-                        const uri = new URI(`http://${address}`);
-                        (await this.openerService.getOpener(uri)).open(uri);
-                    }
-                }} title={nls.localizeByDefault('Follow link') + ' (ctrl/cmd + click)'}>
-                    {port.localPort ? address : ''}
-                </span>
-                {
-                    port.localPort &&
-                    <span className='codicon codicon-clippy action-label' title={nls.localizeByDefault('Copy Local Address')} onClick={() => {
-                        this.clipboardService.writeText(address);
-                    }}></span>
-                }
-            </div>
-        </td>;
-    }
-
-    protected renderPortColumn(port: ForwardedPort): ReactNode {
-        return port.editing ?
-            <td><PortEditingInput port={port} service={this.portForwardingService} /></td> :
-            <td>
-                <div className='button-cell'>
-                    <span style={{ flexGrow: 1 }}>{port.localPort}</span>
-                    <span className='codicon codicon-close action-label' title={nls.localizeByDefault('Stop Forwarding Port')} onClick={() => {
-                        this.portForwardingService.removePort(port);
-                        this.update();
-                    }}></span>
-                </div>
-            </td>;
-    }
-
-}
-
-function PortEditingInput({ port, service }: { port: ForwardedPort, service: PortForwardingService }): React.JSX.Element {
-    const [error, setError] = React.useState(false);
-    return <input className={`theia-input forward-port-button${error ? ' port-edit-input-error' : ''}`} port-edit-input-error={error}
-        autoFocus defaultValue={port.address ? `${port.address}:${port.localPort}` : port.localPort ?? ''}
-        placeholder={nls.localizeByDefault('Port number or address (eg. 3000 or 10.10.10.10:2000).')}
-        onKeyDown={e => e.key === 'Enter' && !error && service.updatePort(port, e.currentTarget.value)}
-        onKeyUp={e => setError(!service.isValidAddress(e.currentTarget.value))}></input>;
-
-}
+// *****************************************************************************
+// Copyright (C) 2024 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from '@theia/core/shared/react';
+import { ReactNode } from '@theia/core/shared/react';
+import { OpenerService, ReactWidget } from '@theia/core/lib/browser';
+import { nls, URI } from '@theia/core';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { ForwardedPort, PortForwardingService } from './port-forwarding-service';
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
+
+export const PORT_FORWARDING_WIDGET_ID = 'port-forwarding-widget';
+
+@injectable()
+export class PortForwardingWidget extends ReactWidget {
+
+    @inject(PortForwardingService)
+    protected readonly portForwardingService: PortForwardingService;
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    @inject(ClipboardService)
+    protected readonly clipboardService: ClipboardService;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = PORT_FORWARDING_WIDGET_ID;
+        this.node.tabIndex = -1;
+        this.title.label = nls.localizeByDefault('Ports');
+        this.title.caption = this.title.label;
+        this.title.closable = true;
+        this.update();
+
+        this.portForwardingService.onDidChangePorts(() => this.update());
+    }
+
+    protected render(): ReactNode {
+        if (this.portForwardingService.forwardedPorts.length === 0) {
+            return <div>
+                <p style={{ marginLeft: 'calc(var(--theia-ui-padding) * 2)' }}>
+                    {nls.localizeByDefault('No forwarded ports. Forward a port to access your locally running services over the internet.\n[Forward a Port]({0})').split('\n')[0]}
+                </p>
+                {this.renderForwardPortButton()}
+            </div>;
+        }
+
+        return <div>
+            <table className='port-table'>
+                <thead>
+                    <tr>
+                        <th className='port-table-header'>{nls.localizeByDefault('Port')}</th>
+                        <th className='port-table-header'>{nls.localizeByDefault('Address')}</th>
+                        <th className='port-table-header'>{nls.localizeByDefault('Running Process')}</th>
+                        <th className='port-table-header'>{nls.localizeByDefault('Origin')}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {this.portForwardingService.forwardedPorts.map(port => (
+                        <tr key={port.localPort ?? 'editing'}>
+                            {this.renderPortColumn(port)}
+                            {this.renderAddressColumn(port)}
+                            <td></td>
+                            <td>{port.origin ? nls.localizeByDefault(port.origin) : ''}</td>
+                        </tr>
+                    ))}
+                    {!this.portForwardingService.forwardedPorts.some(port => port.editing) && <tr><td>{this.renderForwardPortButton()}</td></tr>}
+                </tbody>
+            </table>
+        </div>;
+    }
+
+    protected renderForwardPortButton(): ReactNode {
+        return <button className='theia-button' onClick={() => {
+            this.portForwardingService.forwardNewPort('User Forwarded');
+            this.update();
+        }
+        }>{nls.localizeByDefault('Forward a Port')}</button>;
+    }
+
+    protected renderAddressColumn(port: ForwardedPort): ReactNode {
+        const address = `${port.address ?? '0.0.0.0'}:${port.localPort}`;
+        return <td>
+            <div className='button-cell'>
+                <span style={{ flexGrow: 1 }} className='forwarded-address' onClick={async e => {
+                    if (e.ctrlKey) {
+                        const uri = new URI(`http://${address}`);
+                        (await this.openerService.getOpener(uri)).open(uri);
+                    }
+                }} title={nls.localizeByDefault('Follow link') + ' (ctrl/cmd + click)'}>
+                    {port.localPort ? address : ''}
+                </span>
+                {
+                    port.localPort &&
+                    <span className='codicon codicon-clippy action-label' title={nls.localizeByDefault('Copy Local Address')} onClick={() => {
+                        this.clipboardService.writeText(address);
+                    }}></span>
+                }
+            </div>
+        </td>;
+    }
+
+    protected renderPortColumn(port: ForwardedPort): ReactNode {
+        return port.editing ?
+            <td><PortEditingInput port={port} service={this.portForwardingService} /></td> :
+            <td>
+                <div className='button-cell'>
+                    <span style={{ flexGrow: 1 }}>{port.localPort}</span>
+                    <span className='codicon codicon-close action-label' title={nls.localizeByDefault('Stop Forwarding Port')} onClick={() => {
+                        this.portForwardingService.removePort(port);
+                        this.update();
+                    }}></span>
+                </div>
+            </td>;
+    }
+
+}
+
+function PortEditingInput({ port, service }: { port: ForwardedPort, service: PortForwardingService }): React.JSX.Element {
+    const [error, setError] = React.useState(false);
+    return <input className={`theia-input forward-port-button${error ? ' port-edit-input-error' : ''}`} port-edit-input-error={error}
+        autoFocus defaultValue={port.address ? `${port.address}:${port.localPort}` : port.localPort ?? ''}
+        placeholder={nls.localizeByDefault('Port number or address (eg. 3000 or 10.10.10.10:2000).')}
+        onKeyDown={e => e.key === 'Enter' && !error && service.updatePort(port, e.currentTarget.value)}
+        onKeyUp={e => setError(!service.isValidAddress(e.currentTarget.value))}></input>;
+
+}

package/src/electron-browser/remote-electron-file-dialog-service.ts

@@ -1,47 +1,47 @@
-// *****************************************************************************
-// Copyright (C) 2023 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { MaybeArray, URI } from '@theia/core';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { OpenFileDialogProps, SaveFileDialogProps } from '@theia/filesystem/lib/browser/file-dialog';
-import { FileStat } from '@theia/filesystem/lib/common/files';
-import { DefaultFileDialogService } from '@theia/filesystem/lib/browser/file-dialog/file-dialog-service';
-import { ElectronFileDialogService } from '@theia/filesystem/lib/electron-browser/file-dialog/electron-file-dialog-service';
-import { RemoteService } from './remote-service';
-
-@injectable()
-export class RemoteElectronFileDialogService extends ElectronFileDialogService {
-
-    @inject(RemoteService) protected readonly remoteService: RemoteService;
-
-    override showOpenDialog(props: OpenFileDialogProps & { canSelectMany: true; }, folder?: FileStat | undefined): Promise<MaybeArray<URI> | undefined>;
-    override showOpenDialog(props: OpenFileDialogProps, folder?: FileStat | undefined): Promise<URI | undefined>;
-    override showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined> | Promise<URI | undefined> {
-        if (this.remoteService.isConnected()) {
-            return DefaultFileDialogService.prototype.showOpenDialog.call(this, props, folder);
-        } else {
-            return super.showOpenDialog(props, folder);
-        }
-    }
-
-    override showSaveDialog(props: SaveFileDialogProps, folder?: FileStat | undefined): Promise<URI | undefined> {
-        if (this.remoteService.isConnected()) {
-            return DefaultFileDialogService.prototype.showSaveDialog.call(this, props, folder);
-        } else {
-            return super.showSaveDialog(props, folder);
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2023 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { MaybeArray, URI } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { OpenFileDialogProps, SaveFileDialogProps } from '@theia/filesystem/lib/browser/file-dialog';
+import { FileStat } from '@theia/filesystem/lib/common/files';
+import { DefaultFileDialogService } from '@theia/filesystem/lib/browser/file-dialog/file-dialog-service';
+import { ElectronFileDialogService } from '@theia/filesystem/lib/electron-browser/file-dialog/electron-file-dialog-service';
+import { RemoteService } from './remote-service';
+
+@injectable()
+export class RemoteElectronFileDialogService extends ElectronFileDialogService {
+
+    @inject(RemoteService) protected readonly remoteService: RemoteService;
+
+    override showOpenDialog(props: OpenFileDialogProps & { canSelectMany: true; }, folder?: FileStat | undefined): Promise<MaybeArray<URI> | undefined>;
+    override showOpenDialog(props: OpenFileDialogProps, folder?: FileStat | undefined): Promise<URI | undefined>;
+    override showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined> | Promise<URI | undefined> {
+        if (this.remoteService.isConnected()) {
+            return DefaultFileDialogService.prototype.showOpenDialog.call(this, props, folder);
+        } else {
+            return super.showOpenDialog(props, folder);
+        }
+    }
+
+    override showSaveDialog(props: SaveFileDialogProps, folder?: FileStat | undefined): Promise<URI | undefined> {
+        if (this.remoteService.isConnected()) {
+            return DefaultFileDialogService.prototype.showSaveDialog.call(this, props, folder);
+        } else {
+            return super.showSaveDialog(props, folder);
+        }
+    }
+}