fixes

starsky/starsky.feature.desktop/Interfaces/IOpenEditorDesktopService.cs

@@ -4,6 +4,18 @@ namespace starsky.feature.desktop.Interfaces;
 
 public interface IOpenEditorDesktopService
 {
+	/// <summary>
+	/// Is supported and enabled in the feature toggle
+	/// </summary>
+	/// <returns>Should you use it?</returns>
+	bool IsEnabled();
+
+	/// <summary>
+	/// Open a file in the default editor or specific editor which is set in the app settings
+	/// </summary>
+	/// <param name="f">dot comma split list with subPaths</param>
+	/// <param name="collections">should pick raw/jpeg file even its not specified</param>
+	/// <returns>files done and list of results</returns>
 	Task<(bool?, string, List<PathImageFormatExistsAppPathModel>)> OpenAsync(string f,
 		bool collections);
 }

starsky/starsky.feature.desktop/Service/OpenEditorDesktopService.cs

@@ -27,6 +27,12 @@ public OpenEditorDesktopService(AppSettings appSettings,
 		_openEditorPreflight = openEditorPreflight;
 	}
 
+	public bool IsEnabled()
+	{
+		return _appSettings.UseLocalDesktop == true &&
+		       _openApplicationNativeService.DetectToUseOpenApplication();
+	}
+
 	public async Task<(bool?, string, List<PathImageFormatExistsAppPathModel>)> OpenAsync(string f,
 		bool collections)
 	{

starsky/starsky.feature.trash/Interfaces/IMoveToTrashService.cs

@@ -14,13 +14,6 @@ public interface IMoveToTrashService
 	Task<List<FileIndexItem>> MoveToTrashAsync(List<string> inputFilePaths,
 		bool collections);
 
-	/// <summary>
-	/// Is it supported to use the system trash
-	/// But it does NOT check if the feature toggle is enabled
-	/// </summary>
-	/// <returns>true if supported</returns>
-	bool DetectToUseSystemTrash();
-
 	/// <summary>
 	/// Is supported and enabled in the feature toggle
 	/// </summary>

starsky/starsky.feature.trash/Services/MoveToTrashService.cs

@@ -10,6 +10,7 @@
 using starsky.foundation.worker.Interfaces;
 
 [assembly: InternalsVisibleTo("starskytest")]
+
 namespace starsky.feature.trash.Services;
 
 [Service(typeof(IMoveToTrashService), InjectionLifetime = InjectionLifetime.Scoped)]
@@ -46,17 +47,7 @@ ITrashConnectionService connectionService
 	public bool IsEnabled()
 	{
 		return _appSettings.UseSystemTrash == true &&
-			   _systemTrashService.DetectToUseSystemTrash();
-	}
-
-	/// <summary>
-	/// Is it supported to use the system trash
-	/// But it does NOT check if the feature toggle is enabled
-	/// </summary>
-	/// <returns>true if supported</returns>
-	public bool DetectToUseSystemTrash()
-	{
-		return _systemTrashService.DetectToUseSystemTrash();
+		       _systemTrashService.DetectToUseSystemTrash();
 	}
 
 	/// <summary>
@@ -74,11 +65,13 @@ public async Task<List<FileIndexItem>> MoveToTrashAsync(
 			await _metaPreflight.PreflightAsync(inputModel, inputFilePaths,
 				false, collections, 0);
 
-		(fileIndexResultsList, changedFileIndexItemName) = await AppendChildItemsToTrashList(fileIndexResultsList, changedFileIndexItemName);
+		( fileIndexResultsList, changedFileIndexItemName ) =
+			await AppendChildItemsToTrashList(fileIndexResultsList, changedFileIndexItemName);
 
 		var moveToTrashList =
 			fileIndexResultsList.Where(p =>
-				p.Status is FileIndexItem.ExifStatus.Ok or FileIndexItem.ExifStatus.Deleted).ToList();
+					p.Status is FileIndexItem.ExifStatus.Ok or FileIndexItem.ExifStatus.Deleted)
+				.ToList();
 
 		var isSystemTrashEnabled = IsEnabled();
 
@@ -92,9 +85,8 @@ await _queue.QueueBackgroundWorkItemAsync(async _ =>
 				return;
 			}
 
-			await MetaTrashInQueue(changedFileIndexItemName!,
+			await MetaTrashInQueue(changedFileIndexItemName,
 				fileIndexResultsList, inputModel, collections);
-
 		}, "trash");
 
 		return TrashConnectionService.StatusUpdate(moveToTrashList, isSystemTrashEnabled);
@@ -112,8 +104,9 @@ await _metaUpdateService.UpdateAsync(changedFileIndexItemName,
 	/// </summary>
 	/// <param name="moveToTrash"></param>
 	/// <param name="changedFileIndexItemName"></param>
-	internal async Task<(List<FileIndexItem>, Dictionary<string, List<string>>?)> AppendChildItemsToTrashList(List<FileIndexItem> moveToTrash,
-		Dictionary<string, List<string>> changedFileIndexItemName)
+	internal async Task<(List<FileIndexItem>, Dictionary<string, List<string>>)>
+		AppendChildItemsToTrashList(List<FileIndexItem> moveToTrash,
+			Dictionary<string, List<string>> changedFileIndexItemName)
 	{
 		var parentSubPaths = moveToTrash
 			.Where(p => !string.IsNullOrEmpty(p.FilePath) && p.IsDirectory == true)
@@ -122,7 +115,7 @@ await _metaUpdateService.UpdateAsync(changedFileIndexItemName,
 
 		if ( parentSubPaths.Count == 0 )
 		{
-			return (moveToTrash, changedFileIndexItemName);
+			return ( moveToTrash, changedFileIndexItemName );
 		}
 
 		var childItems = ( await _query.GetAllObjectsAsync(parentSubPaths) )
@@ -139,7 +132,7 @@ await _metaUpdateService.UpdateAsync(changedFileIndexItemName,
 			changedFileIndexItemName.TryAdd(childItem.FilePath!, new List<string> { "tags" });
 		}
 
-		return (moveToTrash, changedFileIndexItemName);
+		return ( moveToTrash, changedFileIndexItemName );
 	}
 
 	private async Task SystemTrashInQueue(List<FileIndexItem> moveToTrash)

starsky/starsky.project.web/ViewModels/EnvFeaturesViewModel.cs

@@ -11,4 +11,9 @@ public class EnvFeaturesViewModel
 	/// Enable or disable some features on the frontend
 	/// </summary>
 	public bool UseLocalDesktop { get; set; }
+
+	/// <summary>
+	/// Is supported and enabled in the feature toggle
+	/// </summary>
+	public bool OpenEditorEnabled { get; set; }
 }

starsky/starsky/Controllers/AppSettingsFeaturesController.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using starsky.feature.desktop.Interfaces;
 using starsky.feature.trash.Interfaces;
 using starsky.foundation.platform.Models;
 using starsky.project.web.ViewModels;
@@ -10,11 +11,14 @@ public class AppSettingsFeaturesController : Controller
 {
 	private readonly IMoveToTrashService _moveToTrashService;
 	private readonly AppSettings _appSettings;
+	private readonly IOpenEditorDesktopService _openEditorDesktopService;
 
 	public AppSettingsFeaturesController(IMoveToTrashService moveToTrashService,
+		IOpenEditorDesktopService openEditorDesktopService,
 		AppSettings appSettings)
 	{
 		_moveToTrashService = moveToTrashService;
+		_openEditorDesktopService = openEditorDesktopService;
 		_appSettings = appSettings;
 	}
 
@@ -38,6 +42,7 @@ public IActionResult FeaturesView()
 		{
 			SystemTrashEnabled = _moveToTrashService.IsEnabled(),
 			UseLocalDesktop = _appSettings.UseLocalDesktop == true,
+			OpenEditorEnabled = _openEditorDesktopService.IsEnabled()
 		};
 
 		return Json(shortAppSettings);

starsky/starsky/Controllers/TrashController.cs

@@ -20,21 +20,7 @@ public TrashController(IMoveToTrashService moveToTrashService)
 	}
 
 	/// <summary>
-	/// Is the system trash supported
-	/// </summary>
-	/// <returns>bool with json (IActionResult Result)</returns>
-	/// <response code="200">the item including the updated content</response>
-	/// <response code="401">User unauthorized</response>
-	[ProducesResponseType(typeof(bool), 200)]
-	[HttpGet("/api/trash/detect-to-use-system-trash")]
-	[Produces("application/json")]
-	public IActionResult DetectToUseSystemTrash()
-	{
-		return Json(_moveToTrashService.DetectToUseSystemTrash());
-	}
-
-	/// <summary>
-	/// (beta) Move a file to the trash
+	/// Move a file to the trash
 	/// </summary>
 	/// <param name="f">subPath filepath to file, split by dot comma (;)</param>
 	/// <param name="collections">stack collections</param>
@@ -56,7 +42,8 @@ public async Task<IActionResult> TrashMoveAsync(string f, bool collections = fal
 			return BadRequest("No input files");
 		}
 
-		var fileIndexResultsList = await _moveToTrashService.MoveToTrashAsync(inputFilePaths.ToList(), collections);
+		var fileIndexResultsList =
+			await _moveToTrashService.MoveToTrashAsync(inputFilePaths.ToList(), collections);
 
 		return Json(fileIndexResultsList);
 	}

starsky/starsky/clientapp/src/shared/url-query.ts

@@ -325,7 +325,7 @@ export class UrlQuery {
   };
 
   public UrlApiFeaturesAppSettings = (): string => {
-    return this.prefix + "/api/env/features";
+    return this.prefix + "/api/env/features?v=0.6.0-beta.2";
   };
 
   /**

starsky/starskytest/Controllers/AppSettingsFeaturesControllerTest.cs

@@ -18,7 +18,7 @@ public void FeaturesViewTest()
 		// Arrange
 		var fakeIMoveToTrashService = new FakeIMoveToTrashService(new List<FileIndexItem>());
 		var appSettingsFeaturesController = new AppSettingsFeaturesController(
-			fakeIMoveToTrashService, new AppSettings());
+			fakeIMoveToTrashService, new FakeIOpenEditorDesktopService(), new AppSettings());
 
 		// Act
 		var result = appSettingsFeaturesController.FeaturesView() as JsonResult;
@@ -35,7 +35,8 @@ public void FeaturesViewTest_Disabled()
 		// Arrange
 		var fakeIMoveToTrashService = new FakeIMoveToTrashService(new List<FileIndexItem>(), false);
 		var appSettingsFeaturesController = new AppSettingsFeaturesController(
-			fakeIMoveToTrashService, new AppSettings { UseLocalDesktop = false });
+			fakeIMoveToTrashService, new FakeIOpenEditorDesktopService(),
+			new AppSettings { UseLocalDesktop = false });
 
 		// Act
 		var result = appSettingsFeaturesController.FeaturesView() as JsonResult;
@@ -53,7 +54,8 @@ public void FeaturesViewTest_Enabled()
 		// Arrange
 		var fakeIMoveToTrashService = new FakeIMoveToTrashService(new List<FileIndexItem>());
 		var appSettingsFeaturesController = new AppSettingsFeaturesController(
-			fakeIMoveToTrashService, new AppSettings { UseLocalDesktop = true });
+			fakeIMoveToTrashService, new FakeIOpenEditorDesktopService(),
+			new AppSettings { UseLocalDesktop = true });
 
 		// Act
 		var result = appSettingsFeaturesController.FeaturesView() as JsonResult;

starsky/starskytest/Controllers/TrashControllerTest.cs

@@ -17,45 +17,31 @@ public async Task TrashControllerTest_BadInput()
 		var controller = new TrashController(
 			new FakeIMoveToTrashService(new List<FileIndexItem>()));
 		var result = await controller.TrashMoveAsync(null!, true) as BadRequestObjectResult;
-		Assert.AreEqual(400,result?.StatusCode);
+		Assert.AreEqual(400, result?.StatusCode);
 	}
-	
+
 	[TestMethod]
 	public async Task TrashControllerTest_NotFound()
 	{
 		var controller = new TrashController(
 			new FakeIMoveToTrashService(new List<FileIndexItem>()));
 		var result = await controller.TrashMoveAsync("/test.jpg", true) as JsonResult;
 		var resultValue = result?.Value as List<FileIndexItem>;
-		
+
 		Assert.AreEqual(1, resultValue?.Count);
 	}
-	
+
 	[TestMethod]
 	public async Task TrashControllerTest_Ok()
 	{
 		var controller = new TrashController(
-			new FakeIMoveToTrashService(new List<FileIndexItem>{new FileIndexItem("/test.jpg")
+			new FakeIMoveToTrashService(new List<FileIndexItem>
 			{
-				Status = FileIndexItem.ExifStatus.Ok
-			}}));
+				new FileIndexItem("/test.jpg") { Status = FileIndexItem.ExifStatus.Ok }
+			}));
 		var result = await controller.TrashMoveAsync("/test.jpg", true) as JsonResult;
 		var resultValue = result?.Value as List<FileIndexItem>;
-		
+
 		Assert.AreEqual(1, resultValue?.Count);
 	}
-
-	[TestMethod]
-	public void DetectToUseSystemTrash_Ok()
-	{
-		var controller = new TrashController(
-			new FakeIMoveToTrashService(new List<FileIndexItem>()));
-
-		var result = controller.DetectToUseSystemTrash() as JsonResult;
-
-		var tryParseResult = bool.TryParse(result?.Value?.ToString(), out var resultValue);
-
-		Assert.AreEqual(true, tryParseResult);
-		Assert.AreEqual(true, resultValue);
-	}
 }

starsky/starskytest/FakeMocks/FakeIOpenEditorDesktopService.cs

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using starsky.feature.desktop.Interfaces;
+using starsky.feature.desktop.Models;
+using starsky.foundation.database.Models;
+using starsky.foundation.platform.Helpers;
+
+namespace starskytest.FakeMocks;
+
+public class FakeIOpenEditorDesktopService : IOpenEditorDesktopService
+{
+	private readonly bool _isEnabled;
+
+	public FakeIOpenEditorDesktopService(bool isEnabled = true)
+	{
+		_isEnabled = isEnabled;
+	}
+
+	public bool IsEnabled()
+	{
+		return _isEnabled;
+	}
+
+	public async Task<(bool?, string, List<PathImageFormatExistsAppPathModel>)> OpenAsync(string f,
+		bool collections)
+	{
+		await Task.Yield();
+
+		var list = new List<PathImageFormatExistsAppPathModel>
+		{
+			new PathImageFormatExistsAppPathModel
+			{
+				AppPath = "test",
+				Status = FileIndexItem.ExifStatus.Ok,
+				ImageFormat = ExtensionRolesHelper.ImageFormat.jpg,
+				SubPath = "/test.jpg",
+				FullFilePath = "/test.jpg"
+			}
+		};
+
+		return ( _isEnabled, "Opened", list );
+	}
+}

starsky/starskytest/starsky.feature.desktop/Service/OpenEditorDesktopServiceTest.cs

@@ -16,8 +16,8 @@ public class OpenEditorDesktopServiceTest
 	[TestMethod]
 	public async Task OpenAsync_stringInput_HappyFlow()
 	{
-		var fakeService =
-			new FakeIOpenApplicationNativeService(new List<string> { "/test.jpg" }, "test");
+		var fakeService = new FakeIOpenApplicationNativeService(
+			new List<string> { "/test.jpg" }, "test");
 
 		var appSettings = new AppSettings
 		{
@@ -153,15 +153,14 @@ public async Task OpenAsync_ListInput_UseLocalDesktop_Null()
 	[TestMethod]
 	public async Task OpenAsync_ListInput_UnSupportedPlatform()
 	{
-		var fakeService =
-			new FakeIOpenApplicationNativeService(new List<string>(), string.Empty, false);
+		var fakeService = new FakeIOpenApplicationNativeService(new List<string>(),
+			string.Empty, false);
 
 		var appSettings = new AppSettings { UseLocalDesktop = true };
 
 		var preflight = new FakeIOpenEditorPreflight(new List<PathImageFormatExistsAppPathModel>());
 
-		var service =
-			new OpenEditorDesktopService(appSettings, fakeService, preflight);
+		var service = new OpenEditorDesktopService(appSettings, fakeService, preflight);
 
 		var (success, status, list) =
 			( await service.OpenAsync(new List<string> { "/test.jpg" }, true) );

starsky/starskytest/starsky.feature.trash/Services/MoveToTrashServiceTest.cs

@@ -313,20 +313,6 @@ public async Task InMetaTrash_WithDbContext_Directory()
 		Assert.AreEqual(TrashKeyword.TrashKeywordString, result[1].Tags);
 	}
 
-	[TestMethod]
-	public void DetectToUseSystemTrash_False()
-	{
-		var trashService = new FakeITrashService() { IsSupported = false };
-		var moveToTrashService = new MoveToTrashService(new AppSettings(), new FakeIQuery(),
-			new FakeMetaPreflight(), new FakeIUpdateBackgroundTaskQueue(),
-			trashService, new FakeIMetaUpdateService(),
-			new FakeITrashConnectionService());
-
-		var result = moveToTrashService.DetectToUseSystemTrash();
-
-		Assert.AreEqual(false, result);
-	}
-
 	[TestMethod]
 	public async Task AppendChildItemsToTrashList_NoAny()
 	{