Feature: Added run as admin toggle to shortcut properties (#10833)

Author: hecksmosis

src/Files.App/Helpers/UIFilesystemHelpers.cs

@@ -379,7 +379,7 @@ public static async Task CreateFolderWithSelectionAsync(IShellPage associatedIns
 		}
 
 		/// <summary>
-		/// Set a single file or folder to hidden or unhidden an refresh the
+		/// Set a single file or folder to hidden or unhidden and refresh the
 		/// view after setting the flag
 		/// </summary>
 		/// <param name="item"></param>
@@ -396,5 +396,21 @@ public static async Task CreateShortcutFromDialogAsync(IShellPage associatedInst
 			var dialogService = Ioc.Default.GetRequiredService<IDialogService>();
 			await dialogService.ShowDialogAsync(viewModel);
 		}
+
+		/// <summary>
+		/// Updates ListedItem properties for a shortcut
+		/// </summary>
+		/// <param name="item"></param>
+		/// <param name="targetPath"></param>
+		/// <param name="arguments"></param>
+		/// <param name="workingDir"></param>
+		/// <param name="runAsAdmin"></param>
+		public static void UpdateShortcutItemProperties(ShortcutItem item, string targetPath, string arguments, string workingDir, bool runAsAdmin)
+		{
+			item.TargetPath = targetPath;
+			item.Arguments = arguments;
+			item.WorkingDirectory = workingDir;
+			item.RunAsAdmin = runAsAdmin;
+		}
 	}
 }

src/Files.App/ViewModels/Properties/FileProperties.cs

@@ -69,13 +69,15 @@ public override void GetBaseProperties()
 			ViewModel.ShortcutItemWorkingDirVisibility = Item.IsLinkItem || shortcutItem.IsSymLink ? false : true;
 			ViewModel.ShortcutItemArguments = shortcutItem.Arguments;
 			ViewModel.ShortcutItemArgumentsVisibility = Item.IsLinkItem || shortcutItem.IsSymLink ? false : true;
+			if (isApplication)
+				ViewModel.RunAsAdmin = shortcutItem.RunAsAdmin;
 			ViewModel.IsSelectedItemShortcut = FileExtensionHelpers.IsShortcutFile(Item.FileExtension);
 			ViewModel.ShortcutItemOpenLinkCommand = new RelayCommand(async () =>
 			{
 				if (Item.IsLinkItem)
 				{
 					var tmpItem = (ShortcutItem)Item;
-					await Win32Helpers.InvokeWin32ComponentAsync(ViewModel.ShortcutItemPath, AppInstance, ViewModel.ShortcutItemArguments, tmpItem.RunAsAdmin, ViewModel.ShortcutItemWorkingDir);
+					await Win32Helpers.InvokeWin32ComponentAsync(ViewModel.ShortcutItemPath, AppInstance, ViewModel.ShortcutItemArguments, ViewModel.RunAsAdmin, ViewModel.ShortcutItemWorkingDir);
 				}
 				else
 				{
@@ -311,16 +313,17 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 					}
 					break;
 
+				case "RunAsAdmin":
 				case "ShortcutItemPath":
 				case "ShortcutItemWorkingDir":
 				case "ShortcutItemArguments":
-					var tmpItem = (ShortcutItem)Item;
 					if (string.IsNullOrWhiteSpace(ViewModel.ShortcutItemPath))
 						return;
 
-					await FileOperationsHelpers.CreateOrUpdateLinkAsync(Item.ItemPath, ViewModel.ShortcutItemPath, ViewModel.ShortcutItemArguments, ViewModel.ShortcutItemWorkingDir, tmpItem.RunAsAdmin);
+					await FileOperationsHelpers.CreateOrUpdateLinkAsync(Item.ItemPath, ViewModel.ShortcutItemPath, ViewModel.ShortcutItemArguments, ViewModel.ShortcutItemWorkingDir, ViewModel.RunAsAdmin);
 					break;
 			}
 		}
 	}
+
 }

src/Files.App/ViewModels/SelectedItemsPropertiesViewModel.cs

@@ -602,5 +602,23 @@ public bool IsHidden
 			get => isHidden;
 			set => SetProperty(ref isHidden, value);
 		}
+
+		private bool runAsAdmin;
+		public bool RunAsAdmin
+		{
+			get => runAsAdmin;
+			set
+			{
+				RunAsAdminEnabled = true;
+				SetProperty(ref runAsAdmin, value);
+			}
+		}
+
+		private bool runAsAdminEnabled;
+		public bool RunAsAdminEnabled
+		{
+			get => runAsAdminEnabled;
+			set => SetProperty(ref runAsAdminEnabled, value);
+		}
 	}
 }

src/Files.App/Views/Pages/PropertiesShortcut.xaml

@@ -14,6 +14,7 @@
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
+				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/RightAlignedToggleSwitchStyle.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
 	</local:PropertiesTab.Resources>
@@ -127,6 +128,17 @@
 				Text="{x:Bind ViewModel.ShortcutItemWorkingDir, Mode=TwoWay}" />
 		</Grid>
 
+        <local1:SettingsBlockControl 
+	        x:Name="RunAsAdminCheckbox" 
+	        Title="{helpers:ResourceString Name=RunAsAdministrator}" 
+	        HorizontalAlignment="Stretch" 
+	        x:Load="{x:Bind ViewModel.RunAsAdminEnabled, Mode=OneWay}">
+			<ToggleSwitch
+				AutomationProperties.Name="{helpers:ResourceString Name=RunAsAdministrator}"
+				IsOn="{x:Bind ViewModel.RunAsAdmin, Mode=TwoWay}"
+				Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+		</local1:SettingsBlockControl>
+
 		<local1:SettingsBlockControl
 			x:Name="OpenFileLocation"
 			Title="{helpers:ResourceString Name=OpenFileLocation}"

src/Files.App/Views/Pages/PropertiesShortcut.xaml.cs

@@ -1,4 +1,7 @@
+using CommunityToolkit.WinUI;
+using Files.App.Filesystem;
 using Files.App.ViewModels.Properties;
+using Files.App.Helpers;
 using System.Threading.Tasks;
 
 namespace Files.App.Views
@@ -10,9 +13,27 @@ public PropertiesShortcut()
 			InitializeComponent();
 		}
 
-		public override Task<bool> SaveChangesAsync()
+		public override async Task<bool> SaveChangesAsync()
 		{
-			return Task.FromResult(true);
+			var shortcutItem = BaseProperties switch
+			{
+				FileProperties properties => properties.Item,
+				FolderProperties properties => properties.Item,
+				_ => null
+			} as ShortcutItem;
+
+			if (shortcutItem is null)
+				return true;
+
+			await App.Window.DispatcherQueue.EnqueueAsync(() =>
+				UIFilesystemHelpers.UpdateShortcutItemProperties(shortcutItem, 
+				ViewModel.ShortcutItemPath,
+				ViewModel.ShortcutItemArguments, 
+				ViewModel.ShortcutItemWorkingDir, 
+				ViewModel.RunAsAdmin)
+			);
+
+			return true;
 		}
 
 		public override void Dispose()