Code Quality: Replace Format Drive command with actions

Author: yaira2

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

@@ -1,37 +1,35 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.Shell;
-
 namespace Files.App.Actions
 {
-	internal sealed class FormatDriveAction : ObservableObject, IAction
+	internal class FormatDriveAction : ObservableObject, IAction
 	{
-		private readonly IContentPageContext context;
+		private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
 
-		private readonly DrivesViewModel drivesViewModel;
+		private readonly DrivesViewModel drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
 
 		public string Label
-			=> "FormatDriveText".GetLocalizedResource();
+			=> Strings.FormatDriveText.GetLocalizedResource();
 
 		public string Description
-			=> "FormatDriveDescription".GetLocalizedResource();
+			=> Strings.FormatDriveDescription.GetLocalizedResource();
 
-		public bool IsExecutable =>
+		public virtual bool IsExecutable =>
 			context.HasItem &&
 			!context.HasSelection &&
 			(drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x =>
 				string.Equals(x.Path, context.Folder?.ItemPath))?.MenuOptions.ShowFormatDrive ?? false);
 
+		public virtual bool IsAccessibleGlobally
+			=> true;
+
 		public FormatDriveAction()
 		{
-			context = Ioc.Default.GetRequiredService<IContentPageContext>();
-			drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
-
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		public Task ExecuteAsync(object? parameter = null)
+		public virtual Task ExecuteAsync(object? parameter = null)
 		{
 			return Win32Helper.OpenFormatDriveDialog(context.Folder?.ItemPath ?? string.Empty);
 		}

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

@@ -0,0 +1,27 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Actions
+{
+	internal sealed class FormatDriveFromSidebarAction : FormatDriveAction
+	{
+		private ISidebarContext SidebarContext { get; } = Ioc.Default.GetRequiredService<ISidebarContext>();
+
+		private readonly DrivesViewModel drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
+
+		public override bool IsExecutable =>
+			SidebarContext.IsItemRightClicked &&
+			SidebarContext.RightClickedItem is not null &&
+			SidebarContext.RightClickedItem.Path is not null &&
+			(drivesViewModel.Drives.Cast<DriveItem>().FirstOrDefault(x =>
+				string.Equals(x.Path, SidebarContext.RightClickedItem.Path))?.MenuOptions.ShowFormatDrive ?? false);
+
+		public override bool IsAccessibleGlobally
+			=> false;
+
+		public override Task ExecuteAsync(object? parameter = null)
+		{
+			return Win32Helper.OpenFormatDriveDialog(SidebarContext?.RightClickedItem?.Path ?? string.Empty);
+		}
+	}
+}

src/Files.App/Data/Commands/Manager/CommandCodes.cs

@@ -47,6 +47,7 @@ public enum CommandCodes
 		CreateShortcutFromDialog,
 		EmptyRecycleBin,
 		FormatDrive,
+		FormatDriveFromSidebar,
 		RestoreRecycleBin,
 		RestoreAllRecycleBin,
 		OpenItem,

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

@@ -179,6 +179,7 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand NewWindow => commands[CommandCodes.NewWindow];
 		public IRichCommand NewTab => commands[CommandCodes.NewTab];
 		public IRichCommand FormatDrive => commands[CommandCodes.FormatDrive];
+		public IRichCommand FormatDriveFromSidebar => commands[CommandCodes.FormatDriveFromSidebar];
 		public IRichCommand NavigateBack => commands[CommandCodes.NavigateBack];
 		public IRichCommand NavigateForward => commands[CommandCodes.NavigateForward];
 		public IRichCommand NavigateUp => commands[CommandCodes.NavigateUp];
@@ -379,6 +380,7 @@ public IEnumerator<IRichCommand> GetEnumerator() =>
 			[CommandCodes.NewWindow] = new NewWindowAction(),
 			[CommandCodes.NewTab] = new NewTabAction(),
 			[CommandCodes.FormatDrive] = new FormatDriveAction(),
+			[CommandCodes.FormatDriveFromSidebar] = new FormatDriveFromSidebarAction(),
 			[CommandCodes.NavigateBack] = new NavigateBackAction(),
 			[CommandCodes.NavigateForward] = new NavigateForwardAction(),
 			[CommandCodes.NavigateUp] = new NavigateUpAction(),

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

@@ -58,6 +58,7 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand RestoreRecycleBin { get; }
 		IRichCommand RestoreAllRecycleBin { get; }
 		IRichCommand FormatDrive { get; }
+		IRichCommand FormatDriveFromSidebar { get; }
 		IRichCommand OpenItem { get; }
 		IRichCommand OpenItemWithApplicationPicker { get; }
 		IRichCommand OpenParentFolder { get; }

src/Files.App/ViewModels/UserControls/SidebarViewModel.cs

@@ -258,7 +258,6 @@ public SidebarViewModel()
 			OpenInNewWindowCommand = new AsyncRelayCommand(OpenInNewWindowAsync);
 			OpenInNewPaneCommand = new AsyncRelayCommand(OpenInNewPaneAsync);
 			EjectDeviceCommand = new RelayCommand(EjectDevice);
-			FormatDriveCommand = new RelayCommand(FormatDrive);
 			OpenPropertiesCommand = new RelayCommand<CommandBarFlyout>(OpenProperties);
 			ReorderItemsCommand = new AsyncRelayCommand(ReorderItemsAsync);
 		}
@@ -839,8 +838,6 @@ public async void HandleItemInvokedAsync(object item, PointerUpdateKind pointerU
 
 		private ICommand EjectDeviceCommand { get; }
 
-		private ICommand FormatDriveCommand { get; }
-
 		private ICommand OpenPropertiesCommand { get; }
 
 		private ICommand ReorderItemsCommand { get; }
@@ -955,11 +952,6 @@ private void EjectDevice()
 			DriveHelpers.EjectDeviceAsync(rightClickedItem.Path);
 		}
 
-		private void FormatDrive()
-		{
-			Win32Helper.OpenFormatDriveDialog(rightClickedItem.Path);
-		}
-
 		private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigationControlItem item, CommandBarFlyout menu)
 		{
 			var options = item.MenuOptions;
@@ -1058,17 +1050,11 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 					ItemType = ContextMenuFlyoutItemType.Separator,
 					ShowItem = Commands.OpenTerminalFromSidebar.IsExecutable ||
 						Commands.OpenStorageSenseFromSidebar.IsExecutable ||
-						options.ShowFormatDrive
+						Commands.FormatDriveFromSidebar.IsExecutable
 				},
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenTerminalFromSidebar).Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenStorageSenseFromSidebar).Build(),
-				new ContextMenuFlyoutItemViewModel()
-				{
-					Text = Strings.FormatDriveText.GetLocalizedResource(),
-					Command = FormatDriveCommand,
-					CommandParameter = item,
-					ShowItem = options.ShowFormatDrive
-				},
+				new ContextMenuFlyoutItemViewModelBuilder(Commands.FormatDriveFromSidebar).Build(),
 				new ContextMenuFlyoutItemViewModel()
 				{
 					ItemType = ContextMenuFlyoutItemType.Separator,