From 33808fdb9cd3af285a479d1986c6cb34570b35a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?= Date: Mon, 1 Dec 2025 20:23:48 +0100 Subject: [PATCH] CmdPal: Hide RDC fallback item by default (#43994) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary of the Pull Request This fixes few nits with RDC extension: - hides the RDC fallback item from the home page when there’s no query; - fixes MSTSC process working directory (must physically exists or be an empty string) ## PR Checklist - [ ] Closes: #xxx - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx ## Detailed Description of the Pull Request / Additional comments ## Validation Steps Performed --- .../FallbackRemoteDesktopItemTests.cs | 12 ++++-------- .../Commands/FallbackRemoteDesktopItem.cs | 9 ++++++--- .../Commands/OpenRemoteDesktopCommand.cs | 2 +- .../FallbackCommandItem.cs | 7 ++++++- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/FallbackRemoteDesktopItemTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/FallbackRemoteDesktopItemTests.cs index 75c63c5ae0..f42520e6de 100644 --- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/FallbackRemoteDesktopItemTests.cs +++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/FallbackRemoteDesktopItemTests.cs @@ -73,13 +73,11 @@ public class FallbackRemoteDesktopItemTests fallback.UpdateQuery(" "); // Assert - Assert.AreEqual(Resources.remotedesktop_command_open, fallback.Title); + Assert.AreEqual(string.Empty, fallback.Title); Assert.AreEqual(string.Empty, fallback.Subtitle); var command = fallback.Command as OpenRemoteDesktopCommand; - Assert.IsNotNull(command); - Assert.AreEqual(Resources.remotedesktop_command_open, command.Name); - Assert.AreEqual(string.Empty, GetCommandHost(command)); + Assert.IsNull(command); } [TestMethod] @@ -93,13 +91,11 @@ public class FallbackRemoteDesktopItemTests fallback.UpdateQuery("not a valid host"); // Assert - Assert.AreEqual(Resources.remotedesktop_command_open, fallback.Title); + Assert.AreEqual(string.Empty, fallback.Title); Assert.AreEqual(string.Empty, fallback.Subtitle); var command = fallback.Command as OpenRemoteDesktopCommand; - Assert.IsNotNull(command); - Assert.AreEqual(Resources.remotedesktop_command_open, command.Name); - Assert.AreEqual(string.Empty, GetCommandHost(command)); + Assert.IsNull(command); } private static string GetCommandHost(OpenRemoteDesktopCommand command) diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs index 8579566b77..e3692a763b 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/FallbackRemoteDesktopItem.cs @@ -23,13 +23,16 @@ internal sealed partial class FallbackRemoteDesktopItem : FallbackCommandItem ]; private static readonly CompositeFormat RemoteDesktopOpenHostFormat = CompositeFormat.Parse(Resources.remotedesktop_open_host); + private readonly IRdpConnectionsManager _rdpConnectionsManager; + private readonly NoOpCommand _emptyCommand = new NoOpCommand(); public FallbackRemoteDesktopItem(IRdpConnectionsManager rdpConnectionsManager) - : base(new OpenRemoteDesktopCommand(string.Empty), Resources.remotedesktop_title) + : base(Resources.remotedesktop_title) { _rdpConnectionsManager = rdpConnectionsManager; + Command = _emptyCommand; Title = string.Empty; Subtitle = string.Empty; Icon = Icons.RDPIcon; @@ -41,7 +44,7 @@ internal sealed partial class FallbackRemoteDesktopItem : FallbackCommandItem { Title = string.Empty; Subtitle = string.Empty; - Command = new OpenRemoteDesktopCommand(string.Empty); + Command = _emptyCommand; return; } @@ -68,7 +71,7 @@ internal sealed partial class FallbackRemoteDesktopItem : FallbackCommandItem { Title = string.Empty; Subtitle = string.Empty; - Command = new OpenRemoteDesktopCommand(string.Empty); + Command = _emptyCommand; } } } diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/OpenRemoteDesktopCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/OpenRemoteDesktopCommand.cs index 679b015a1e..39c53fe9d2 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/OpenRemoteDesktopCommand.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/Commands/OpenRemoteDesktopCommand.cs @@ -40,7 +40,7 @@ internal sealed partial class OpenRemoteDesktopCommand : BaseObservable, IInvoka { using var process = new Process(); process.StartInfo.UseShellExecute = false; - process.StartInfo.WorkingDirectory = Environment.SpecialFolder.MyDocuments.ToString(); + process.StartInfo.WorkingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); process.StartInfo.FileName = "mstsc"; if (!string.IsNullOrWhiteSpace(_rdpHost)) diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/FallbackCommandItem.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/FallbackCommandItem.cs index 13740eb1a1..1c0b5c18d0 100644 --- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/FallbackCommandItem.cs +++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/FallbackCommandItem.cs @@ -6,7 +6,12 @@ namespace Microsoft.CommandPalette.Extensions.Toolkit; public partial class FallbackCommandItem : CommandItem, IFallbackCommandItem, IFallbackHandler { - private IFallbackHandler? _fallbackHandler; + private readonly IFallbackHandler? _fallbackHandler; + + public FallbackCommandItem(string displayTitle) + { + DisplayTitle = displayTitle; + } public FallbackCommandItem(ICommand command, string displayTitle) : base(command)