Remove TransformMenuItems from the plugin API

SidebarMenu doesn't support per-item OnSelect handlers, so non-app menu
items injected by transformers were non-functional. Plugins should use
AddApp instead.

Author: zachwolfe

src/Ivy.Test/PluginLoaderTests.cs

@@ -178,26 +178,6 @@ public void PluginDependencyPreventsUnload()
         }
     }
 
-    [Fact]
-    public void MenuTransformersAreTrackedPerPlugin()
-    {
-        var context = new TestPluginContext();
-
-        context.SetCurrentPlugin("plugin-a", "/plugins/a");
-        context.TransformMenuItems(items => items.Append(new MenuItem("A")));
-        context.ClearCurrentPlugin();
-
-        context.SetCurrentPlugin("plugin-b", "/plugins/b");
-        context.TransformMenuItems(items => items.Append(new MenuItem("B")));
-        context.ClearCurrentPlugin();
-
-        Assert.Equal(2, context.MenuTransformers.Count);
-
-        // Unload plugin A
-        context.RemovePluginContributions("plugin-a");
-
-        Assert.Single(context.MenuTransformers);
-    }
 
 
     [Fact]

src/Ivy/Abstractions/IIvyExtendedPluginContext.cs

@@ -9,9 +9,6 @@ public interface IIvyExtendedPluginContext : IIvyPluginContext
     void AddApp(AppDescriptor descriptor);
     void AddAppsFromAssembly(Assembly assembly);
 
-    // Menu hooks
-    void TransformMenuItems(Func<IEnumerable<MenuItem>, IEnumerable<MenuItem>> transformer, int priority = 0);
-
     // ASP.NET pipeline
     void UseWebApplication(Action<WebApplication> configure);
     void UseWebApplicationBuilder(Action<WebApplicationBuilder> configure);

src/Ivy/AppShell/DefaultSidebarAppShell.cs

@@ -1,7 +1,6 @@
 using Ivy.Core;
 using Ivy.Core.Apps;
 using Ivy.Core.AppShell;
-using Ivy.Core.Plugins;
 using System.Collections.Immutable;
 
 // ReSharper disable once CheckNamespace
@@ -24,11 +23,10 @@ private record TabState(string Id, string AppId, string Title, AppHost AppHost,
         var appRepository = UseService<IAppRepository>();
         var client = UseService<IClientProvider>();
         Context.TryUseService<IAuthService>(out var auth);
-        Context.TryUseService<IPluginMenuContributions>(out var pluginContributions);
         var user = UseState<UserInfo?>();
         var currentApp = UseState<AppHost?>();
         var search = UseState("");
-        var menuItems = UseState(() => ApplyMenuTransformers(appRepository.GetMenuItems(), pluginContributions));
+        var menuItems = UseState(() => appRepository.GetMenuItems());
 
         // Auto-default: if there's exactly one visible app, select it and close sidebar
         var visibleApps = appRepository.GetMenuItems().FlattenWithPath().ToArray();
@@ -70,11 +68,11 @@ void SetAppTitle(string appId)
         {
             if (string.IsNullOrWhiteSpace(search.Value))
             {
-                menuItems.Set(ApplyMenuTransformers(appRepository.GetMenuItems(), pluginContributions));
+                menuItems.Set(appRepository.GetMenuItems());
             }
             else
             {
-                var result = ApplyMenuTransformers(appRepository.GetMenuItems(), pluginContributions)
+                var result = appRepository.GetMenuItems()
                     .FlattenWithPath()
                     .Select(x => new { x.Item, x.Path, Score = AppShellUtils.ItemMatchScore(x.Item, search.Value) })
                     .Where(x => x.Score > 0)
@@ -561,16 +559,4 @@ void OnTabReorder(Event<TabsLayout, int[]> @event)
             settings.Width
         ).Open(sidebarOpen.Value).MainAppSidebar(true);
     }
-
-    private static MenuItem[] ApplyMenuTransformers(MenuItem[] items, IPluginMenuContributions? contributions)
-    {
-        if (contributions is null) return items;
-        var transformers = contributions.MenuTransformers;
-        if (transformers.Count == 0) return items;
-
-        IEnumerable<MenuItem> result = items;
-        foreach (var transformer in transformers)
-            result = transformer(result);
-        return result.ToArray();
-    }
 }

src/Ivy/Core/Plugins/IPluginMenuContributions.cs

@@ -12,7 +12,7 @@ namespace Ivy.Core.Plugins;
 /// This is an internal implementation detail of the plugin hosting infrastructure.
 /// Plugins should only depend on the <see cref="IIvyPluginContext"/> (or derived) interfaces.
 /// </summary>
-public abstract class PluginContextBase : IIvyExtendedPluginContext, IPluginServiceProvider, IPluginMenuContributions
+public abstract class PluginContextBase : IIvyExtendedPluginContext, IPluginServiceProvider
 {
     protected AppRepository AppRepository { get; }
     protected IReadOnlySet<string> ReservedPaths { get; }
@@ -31,7 +31,6 @@ protected PluginContextBase(AppRepository appRepository, IReadOnlySet<string> re
         ReservedPaths = reservedPaths;
         Builder = builder;
     }
-    private readonly List<(Func<IEnumerable<MenuItem>, IEnumerable<MenuItem>> Transformer, int Priority)> _menuTransformers = [];
     private readonly List<Action<WebApplication>> _appActions = [];
     private readonly AggregatePluginServiceProvider _aggregateProvider = new();
     private readonly Dictionary<string, PluginState> _pluginStates = new();
@@ -59,23 +58,6 @@ public IServiceCollection Services
     internal void SetPluginConfig(IIvyPluginConfig config) => _currentPluginConfig = config;
     internal void ClearPluginConfig() => _currentPluginConfig = null;
 
-    public IReadOnlyList<Func<IEnumerable<MenuItem>, IEnumerable<MenuItem>>> MenuTransformers
-    {
-        get
-        {
-            _lock.EnterReadLock();
-            try
-            {
-                return _menuTransformers
-                    .OrderBy(t => t.Priority)
-                    .Select(t => t.Transformer)
-                    .ToList();
-            }
-            finally { _lock.ExitReadLock(); }
-        }
-    }
-
-
     internal void SetCurrentPlugin(string pluginId, string directory)
     {
         _currentPluginId = pluginId;
@@ -111,20 +93,6 @@ public void AddAppsFromAssembly(Assembly assembly)
             state.AppFactories.Add(factory);
     }
 
-    public void TransformMenuItems(Func<IEnumerable<MenuItem>, IEnumerable<MenuItem>> transformer, int priority = 0)
-    {
-        _lock.EnterWriteLock();
-        try
-        {
-            _menuTransformers.Add((transformer, priority));
-            if (_currentPluginId is not null && _pluginStates.TryGetValue(_currentPluginId, out var state))
-                state.MenuTransformers.Add((transformer, priority));
-        }
-        finally
-        {
-            _lock.ExitWriteLock();
-        }
-    }
 
 
     public void UseWebApplication(Action<WebApplication> configure)
@@ -206,9 +174,6 @@ internal virtual void RemovePluginContributions(string pluginId)
             // Collect app IDs before removing factories so we can reload affected sessions
             affectedAppIds = GetAppIdsFromFactories(state.AppFactories);
 
-            foreach (var t in state.MenuTransformers)
-                _menuTransformers.Remove(t);
-
             foreach (var a in state.AppActions)
                 _appActions.Remove(a);
 

src/Ivy/Core/Plugins/PluginContext.cs

@@ -9,7 +9,6 @@ internal class PluginState
     public string Directory { get; }
     public ServiceCollection PluginServices { get; } = new();
 
-    public List<(Func<IEnumerable<MenuItem>, IEnumerable<MenuItem>> Transformer, int Priority)> MenuTransformers { get; } = [];
     public List<Action<WebApplication>> AppActions { get; } = [];
     public List<Func<AppDescriptor[]>> AppFactories { get; } = [];
 

src/Ivy/Core/Plugins/PluginState.cs

@@ -774,7 +774,6 @@ public Server UsePlugins(
             _pluginLoader.Configure(pluginContext);
             pluginContext.BuildServiceProvider();
             builder.Services.AddSingleton<IPluginServiceProvider>(pluginContext);
-            builder.Services.AddSingleton<IPluginMenuContributions>(pluginContext);
             builder.Services.AddSingleton<IPluginManager>(_pluginLoader);
             builder.Services.AddSingleton<IPluginStateService>(sp =>
                 new PluginStateService(sp.GetRequiredService<IPluginManager>()));