[Editor] FetchAsset command

Author: Kryptos-FR

sources/editor/Stride.Core.Assets.Editor/Quantum/NodePresenters/Commands/FetchAssetCommand.cs

@@ -9,7 +9,7 @@
 
 namespace Stride.Core.Assets.Editor.Quantum.NodePresenters.Commands;
 
-public class FetchAssetCommand : NodePresenterCommandBase
+internal sealed class FetchAssetCommand : NodePresenterCommandBase
 {
     /// <summary>
     /// The name of this command.
@@ -18,15 +18,15 @@ public class FetchAssetCommand : NodePresenterCommandBase
     /// <summary>
     /// The current session.
     /// </summary>
-    protected readonly SessionViewModel Session;
+    private readonly SessionViewModel session;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="FetchAssetCommand"/> class.
     /// </summary>
     /// <param name="session">The current session.</param>
     public FetchAssetCommand(SessionViewModel session)
     {
-        Session = session;
+        this.session = session;
     }
 
     /// <inheritdoc/>
@@ -38,14 +38,16 @@ public FetchAssetCommand(SessionViewModel session)
     /// <inheritdoc/>
     public override bool CanAttach(INodePresenter nodePresenter)
     {
-        var type = nodePresenter.Descriptor.GetInnerCollectionType();
-        return AssetRegistry.CanBeAssignedToContentTypes(type, checkIsUrlType: true);
+        if (nodePresenter.Descriptor?.GetInnerCollectionType() is { } type)
+            return AssetRegistry.CanBeAssignedToContentTypes(type, checkIsUrlType: true);
+
+        return false;
     }
 
     /// <inheritdoc/>
     public override Task Execute(INodePresenter nodePresenter, object? parameter, object? preExecuteResult)
     {
-        return Fetch(Session, nodePresenter.Value);
+        return Fetch(session, nodePresenter.Value);
     }
 
     /// <summary>
@@ -58,9 +60,7 @@ public static async Task Fetch(SessionViewModel session, object content)
         var asset = ContentReferenceHelper.GetReferenceTarget(session, content);
         if (asset != null)
         {
-            // FIXME xplat-editor
-            await Task.Yield();
-            //await session.Dispatcher.InvokeAsync(() => session.AssetCollection.SelectAssetCommand.Execute(asset));
+            await session.Dispatcher.InvokeAsync(() => session.AssetCollection.SelectAssetCommand.Execute(asset));
         }
     }
 }

sources/editor/Stride.Core.Assets.Editor/ViewModels/AssetCollectionViewModel.cs

@@ -5,7 +5,9 @@
 using System.Collections.Specialized;
 using Stride.Core.Assets.Editor.Components.Properties;
 using Stride.Core.Assets.Presentation.ViewModels;
+using Stride.Core.Extensions;
 using Stride.Core.Presentation.Collections;
+using Stride.Core.Presentation.Commands;
 using Stride.Core.Presentation.ViewModels;
 
 namespace Stride.Core.Assets.Editor.ViewModels;
@@ -26,6 +28,8 @@ public AssetCollectionViewModel(SessionViewModel session)
         // Initialize the view model that will manage the properties of the assets selected on the main asset view
         AssetViewProperties = new SessionObjectPropertiesViewModel(session);
 
+        SelectAssetCommand = new AnonymousCommand<AssetViewModel>(ServiceProvider, x => SelectAssets(x.Yield()!));
+
         selectedContent.CollectionChanged += SelectedContentCollectionChanged;
         SelectedLocations.CollectionChanged += SelectedLocationCollectionChanged;
     }
@@ -61,7 +65,32 @@ public object? SingleSelectedContent
         get => singleSelectedContent;
         private set => SetValue(ref singleSelectedContent, value);
     }
- 
+
+    public ICommandBase SelectAssetCommand { get; }
+
+    public void SelectAssets(IEnumerable<AssetViewModel> assetsToSelect)
+    {
+        Dispatcher.EnsureAccess();
+
+        var assetList = assetsToSelect.ToList();
+
+        // Ensure the location of the assets to select are themselves selected.
+        var locations = new HashSet<DirectoryBaseViewModel>(assetList.Select(x => x.Directory));
+        if (locations.All(x => !SelectedLocations.Contains(x)))
+        {
+            SelectedLocations.Clear();
+            SelectedLocations.AddRange(locations);
+        }
+
+        // Don't reselect if the current selection is the same
+        if (assetList.Count != SelectedAssets.Count || !assetList.All(x => SelectedAssets.Contains(x)))
+        {
+            selectedContent.Clear();
+            // FIXME xplat-editor filters
+            selectedContent.AddRange(assetList);
+        }
+    }
+
     internal IReadOnlyCollection<DirectoryBaseViewModel> GetSelectedDirectories(bool includeSubDirectoriesOfSelected)
     {
         var selectedDirectories = new List<DirectoryBaseViewModel>();
@@ -162,7 +191,7 @@ private async void SelectedContentCollectionChanged(object? sender, NotifyCollec
         }
 
         AssetViewProperties.UpdateTypeAndName(SelectedAssets, x => x.TypeDisplayName, x => x.Url, "assets");
-        await AssetViewProperties.GenerateSelectionPropertiesAsync(SelectedAssets);            
+        await AssetViewProperties.GenerateSelectionPropertiesAsync(SelectedAssets);
     }
 
     private void SelectedLocationCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)