RichCommand: Open File Location (#12111)

Author: hecksmosis

src/Files.App/Actions/FileSystem/OpenFileLocationAction.cs

@@ -0,0 +1,71 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Files.App.Commands;
+using Files.App.Contexts;
+using Files.App.Extensions;
+using Files.App.Filesystem;
+using Files.App.Helpers;
+using Files.App.Views;
+using Files.Shared.Enums;
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Files.App.Actions
+{
+	internal class OpenFileLocationAction : ObservableObject, IAction
+	{
+		private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
+
+		public string Label => "OpenFileLocation".GetLocalizedResource();
+
+		public string Description => "OpenFileLocationDescription".GetLocalizedResource();
+
+		public RichGlyph Glyph => new(baseGlyph: "\uE8DA");
+
+		public bool IsExecutable => context.HasSelection && context.SelectedItem is ShortcutItem;
+
+		public OpenFileLocationAction()
+		{
+			context.PropertyChanged += Context_PropertyChanged;
+		}
+
+		public async Task ExecuteAsync()
+		{
+			var item = context.SelectedItem as ShortcutItem;
+
+			if (string.IsNullOrWhiteSpace(item?.TargetPath))
+				return;
+
+			// Check if destination path exists
+			var folderPath = Path.GetDirectoryName(item.TargetPath);
+			var destFolder = await context.ShellPage?.FilesystemViewModel.GetFolderWithPathFromPathAsync(folderPath);
+
+			if (destFolder)
+			{
+				context.ShellPage?.NavigateWithArguments(context.ShellPage?.InstanceViewModel.FolderSettings.GetLayoutType(folderPath), new NavigationArguments()
+				{
+					NavPathParam = folderPath,
+					SelectItems = new[] { Path.GetFileName(item.TargetPath.TrimPath()) },
+					AssociatedTabInstance = context.ShellPage
+				});
+			}
+			else if (destFolder == FileSystemStatusCode.NotFound)
+			{
+				await DialogDisplayHelper.ShowDialogAsync("FileNotFoundDialog/Title".GetLocalizedResource(), "FileNotFoundDialog/Text".GetLocalizedResource());
+			}
+			else
+			{
+				await DialogDisplayHelper.ShowDialogAsync("InvalidItemDialogTitle".GetLocalizedResource(),
+					string.Format("InvalidItemDialogContent".GetLocalizedResource(), Environment.NewLine, destFolder.ErrorCode.ToString()));
+			}
+		}
+
+		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName is nameof(IContentPageContext.HasSelection))
+				OnPropertyChanged(nameof(IsExecutable));
+		}
+	}
+}

src/Files.App/Commands/CommandCodes.cs

@@ -38,6 +38,7 @@ public enum CommandCodes
 		OpenItem,
 		OpenItemWithApplicationPicker,
 		OpenParentFolder,
+		OpenFileLocation,
 		RefreshItems,
 		Rename,
 

src/Files.App/Commands/Manager/CommandManager.cs

@@ -137,6 +137,7 @@ internal class CommandManager : ICommandManager
 		public IRichCommand CloseSelectedTab => commands[CommandCodes.CloseSelectedTab];
 		public IRichCommand OpenNewPane => commands[CommandCodes.OpenNewPane];
 		public IRichCommand ClosePane => commands[CommandCodes.ClosePane];
+		public IRichCommand OpenFileLocation => commands[CommandCodes.OpenFileLocation];
 		public IRichCommand PlayAll => commands[CommandCodes.PlayAll];
 
 		public CommandManager()
@@ -281,6 +282,7 @@ public CommandManager()
 			[CommandCodes.CloseSelectedTab] = new CloseSelectedTabAction(),
 			[CommandCodes.OpenNewPane] = new OpenNewPaneAction(),
 			[CommandCodes.ClosePane] = new ClosePaneAction(),
+			[CommandCodes.OpenFileLocation] = new OpenFileLocationAction(),
 			[CommandCodes.PlayAll] = new PlayAllAction(),
 		};
 

src/Files.App/Commands/Manager/ICommandManager.cs

@@ -45,6 +45,7 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand OpenItem { get; }
 		IRichCommand OpenItemWithApplicationPicker { get; }
 		IRichCommand OpenParentFolder { get; }
+		IRichCommand OpenFileLocation { get; }
 		IRichCommand RefreshItems { get; }
 		IRichCommand Rename { get; }
 

src/Files.App/Helpers/ContextFlyoutItemHelper.cs

@@ -257,14 +257,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					ShowInSearchPage = true,
 					ShowItem = itemsSelected && showOpenItemWith
 				},
-				new ContextMenuFlyoutItemViewModel()
-				{
-					Text = "OpenFileLocation".GetLocalizedResource(),
-					Glyph = "\uE8DA",
-					Command = commandsViewModel.OpenFileLocationCommand,
-					ShowItem = itemsSelected && selectedItems.All(i => i.IsShortcut),
-					ShowInSearchPage = true,
-				},
+				new ContextMenuFlyoutItemViewModelBuilder(commands.OpenFileLocation).Build(),
 				new ContextMenuFlyoutItemViewModel()
 				{
 					Text = "OpenInNewTab".GetLocalizedResource(),

src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs

@@ -96,37 +96,6 @@ private void OpenPropertiesFromBaseContextMenuFlyout(object sender, object e)
 			FilePropertiesHelpers.ShowProperties(associatedInstance);
 		}
 
-		public virtual async void OpenFileLocation(RoutedEventArgs e)
-		{
-			ShortcutItem item = SlimContentPage.SelectedItem as ShortcutItem;
-
-			if (string.IsNullOrWhiteSpace(item?.TargetPath))
-				return;
-
-			// Check if destination path exists
-			string folderPath = Path.GetDirectoryName(item.TargetPath);
-			FilesystemResult<StorageFolderWithPath> destFolder = await associatedInstance.FilesystemViewModel.GetFolderWithPathFromPathAsync(folderPath);
-
-			if (destFolder)
-			{
-				associatedInstance.NavigateWithArguments(associatedInstance.InstanceViewModel.FolderSettings.GetLayoutType(folderPath), new NavigationArguments()
-				{
-					NavPathParam = folderPath,
-					SelectItems = new[] { Path.GetFileName(item.TargetPath.TrimPath()) },
-					AssociatedTabInstance = associatedInstance
-				});
-			}
-			else if (destFolder == FileSystemStatusCode.NotFound)
-			{
-				await DialogDisplayHelper.ShowDialogAsync("FileNotFoundDialog/Title".GetLocalizedResource(), "FileNotFoundDialog/Text".GetLocalizedResource());
-			}
-			else
-			{
-				await DialogDisplayHelper.ShowDialogAsync("InvalidItemDialogTitle".GetLocalizedResource(),
-					string.Format("InvalidItemDialogContent".GetLocalizedResource(), Environment.NewLine, destFolder.ErrorCode.ToString()));
-			}
-		}
-
 		public virtual async void OpenDirectoryInNewTab(RoutedEventArgs e)
 		{
 			foreach (ListedItem listedItem in SlimContentPage.SelectedItems)

src/Files.App/Interacts/BaseLayoutCommandsViewModel.cs

@@ -27,7 +27,6 @@ public BaseLayoutCommandsViewModel(IBaseLayoutCommandImplementationModel command
 		private void InitializeCommands()
 		{
 			ShowPropertiesCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.ShowProperties);
-			OpenFileLocationCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.OpenFileLocation);
 			OpenDirectoryInNewTabCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.OpenDirectoryInNewTab);
 			OpenDirectoryInNewPaneCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.OpenDirectoryInNewPane);
 			OpenInNewWindowItemCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.OpenInNewWindowItem);
@@ -46,8 +45,6 @@ private void InitializeCommands()
 
 		public ICommand ShowPropertiesCommand { get; private set; }
 
-		public ICommand OpenFileLocationCommand { get; private set; }
-
 		public ICommand OpenDirectoryInNewTabCommand { get; private set; }
 
 		public ICommand OpenDirectoryInNewPaneCommand { get; private set; }

src/Files.App/Interacts/IBaseLayoutCommandImplementationModel.cs

@@ -10,8 +10,6 @@ public interface IBaseLayoutCommandImplementationModel : IDisposable
 	{
 		void ShowProperties(RoutedEventArgs e);
 
-		void OpenFileLocation(RoutedEventArgs e);
-
 		void OpenDirectoryInNewTab(RoutedEventArgs e);
 
 		void OpenDirectoryInNewPane(RoutedEventArgs e);

src/Files.App/Strings/en-US/Resources.resw

@@ -3178,6 +3178,9 @@
   <data name="ShowCheckboxesWhenSelectingItems" xml:space="preserve">
     <value>Show checkboxes when selecting items</value>
   </data>
+  <data name="OpenFileLocationDescription" xml:space="preserve">
+    <value>Open the item's location</value>
+  </data>
   <data name="DeletePermanently" xml:space="preserve">
     <value>Delete permanently</value>
   </data>