Fix: Fixed issue where right clicking a file would display options to open in new tab (#16627)

ferrariofilippo · web-flow · commit 8d451d58be0a · 2024-12-21T19:40:19.000-05:00
diff --git a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
@@ -409,15 +409,15 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenFileLocation).Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewTabAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && Commands.OpenInNewTabAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewWindowAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && Commands.OpenInNewWindowAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewPaneAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && Commands.OpenInNewPaneAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModel()
 				{
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -961,15 +961,15 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewTabFromSidebarAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && Commands.OpenInNewTabFromSidebarAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewWindowFromSidebarAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && Commands.OpenInNewWindowFromSidebarAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewPaneFromSidebarAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && Commands.OpenInNewPaneFromSidebarAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModel()
 				{
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs
@@ -90,15 +90,15 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 			{
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable
 				}.Build(),
 				new()
 				{
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs
@@ -68,15 +68,15 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 			{
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable
 				}.Build(),
 				new()
 				{
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs
@@ -103,15 +103,15 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 			{
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable
 				}.Build(),
 				new()
 				{
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs
@@ -62,15 +62,15 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 			{
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction)
 				{
-					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane
+					IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable
 				}.Build(),
 				new()
 				{

Original file line number	Diff line number	Diff line change
`@@ -409,15 +409,15 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(`
`409`	`409`	`new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenFileLocation).Build(),`
`410`	`410`	`new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewTabAction)`
`411`	`411`	`{`
`412`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab`
	`412`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && Commands.OpenInNewTabAction.IsExecutable`
`413`	`413`	`}.Build(),`
`414`	`414`	`new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewWindowAction)`
`415`	`415`	`{`
`416`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow`
	`416`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && Commands.OpenInNewWindowAction.IsExecutable`
`417`	`417`	`}.Build(),`
`418`	`418`	`new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewPaneAction)`
`419`	`419`	`{`
`420`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane`
	`420`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && Commands.OpenInNewPaneAction.IsExecutable`
`421`	`421`	`}.Build(),`
`422`	`422`	`new ContextMenuFlyoutItemViewModel()`
`423`	`423`	`{`
Original file line number	Diff line number	Diff line change
`@@ -961,15 +961,15 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio`
`961`	`961`	`}.Build(),`
`962`	`962`	`new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewTabFromSidebarAction)`
`963`	`963`	`{`
`964`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab`
	`964`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && Commands.OpenInNewTabFromSidebarAction.IsExecutable`
`965`	`965`	`}.Build(),`
`966`	`966`	`new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewWindowFromSidebarAction)`
`967`	`967`	`{`
`968`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow`
	`968`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && Commands.OpenInNewWindowFromSidebarAction.IsExecutable`
`969`	`969`	`}.Build(),`
`970`	`970`	`new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewPaneFromSidebarAction)`
`971`	`971`	`{`
`972`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane`
	`972`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && Commands.OpenInNewPaneFromSidebarAction.IsExecutable`
`973`	`973`	`}.Build(),`
`974`	`974`	`new ContextMenuFlyoutItemViewModel()`
`975`	`975`	`{`
Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,15 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`90`	`90`	`{`
`91`	`91`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction)`
`92`	`92`	`{`
`93`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab`
	`93`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable`
`94`	`94`	`}.Build(),`
`95`	`95`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction)`
`96`	`96`	`{`
`97`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow`
	`97`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable`
`98`	`98`	`}.Build(),`
`99`	`99`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction)`
`100`	`100`	`{`
`101`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane`
	`101`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable`
`102`	`102`	`}.Build(),`
`103`	`103`	`new()`
`104`	`104`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,15 +68,15 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`68`	`68`	`{`
`69`	`69`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction)`
`70`	`70`	`{`
`71`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab`
	`71`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable`
`72`	`72`	`}.Build(),`
`73`	`73`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction)`
`74`	`74`	`{`
`75`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow`
	`75`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable`
`76`	`76`	`}.Build(),`
`77`	`77`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction)`
`78`	`78`	`{`
`79`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane`
	`79`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable`
`80`	`80`	`}.Build(),`
`81`	`81`	`new()`
`82`	`82`	`{`
Original file line number	Diff line number	Diff line change
`@@ -103,15 +103,15 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`103`	`103`	`{`
`104`	`104`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction)`
`105`	`105`	`{`
`106`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab`
	`106`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable`
`107`	`107`	`}.Build(),`
`108`	`108`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction)`
`109`	`109`	`{`
`110`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow`
	`110`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable`
`111`	`111`	`}.Build(),`
`112`	`112`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction)`
`113`	`113`	`{`
`114`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane`
	`114`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable`
`115`	`115`	`}.Build(),`
`116`	`116`	`new()`
`117`	`117`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,15 +62,15 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`62`	`62`	`{`
`63`	`63`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction)`
`64`	`64`	`{`
`65`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab`
	`65`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable`
`66`	`66`	`}.Build(),`
`67`	`67`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction)`
`68`	`68`	`{`
`69`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow`
	`69`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable`
`70`	`70`	`}.Build(),`
`71`	`71`	`new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction)`
`72`	`72`	`{`
`73`		`- IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane`
	`73`	`+ IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable`
`74`	`74`	`}.Build(),`
`75`	`75`	`new()`
`76`	`76`	`{`