collapsed fixes

beto-rodriguez · Jun 25, 2024 · 111b8d4 · 111b8d4
1 parent 21d9ef5
commit 111b8d4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/Manuela/AppRouting/AppRoutes.cs b/src/Manuela/AppRouting/AppRoutes.cs
@@ -11,6 +11,8 @@ public class AppRoutes
         .Where(x => x.Settings.IsMain);
     public static IEnumerable<Route> SecondaryMenu => AllRoutes
         .Where(x => !x.Settings.IsMain && !x.Settings.IsHidden);
+    public static IEnumerable<Route> CollapsedElements => AllRoutes
+        .Where(x => x.Settings.CollapsedRoutes is not null);
 
     public static Route[] Build(Action<AppRoutes> builder)
     {
@@ -65,7 +67,7 @@ public static Route[] Build(Action<AppRoutes> builder)
         builder(cb);
 
         var collapsableMenuItem = new Route(
-            typeof(object), typeof(object), "{collapsed}", null, false);
+            typeof(object), typeof(object), "{collapsed}", s => s.Main(icon, displayName), false);
 
         collapsableMenuItem.Settings.CollapsedRoutes = cb._routes;
         AllRoutes.Add(collapsableMenuItem);

diff --git a/src/Manuela/AppRouting/CollapsedBuilder.cs b/src/Manuela/AppRouting/CollapsedBuilder.cs
@@ -10,15 +10,40 @@ public class CollapsedBuilder
         string routeName,
         string displayName,
         string icon,
-        List<string>? styleClass = null)
+        List<string>? styleClass = null,
+        bool isSingleton = false)
     {
         _routes.Add(new Route(viewType, viewModelType, routeName, s =>
         {
             s.DisplayName = displayName;
             s.Icon = icon;
             s.StyleClass = styleClass;
-        }));
+        }, isSingleton));
 
         return this;
     }
+
+    public CollapsedBuilder Add<TView>(
+        string routeName,
+        string displayName,
+        string icon,
+        AppView<TView> viewSettings,
+        List<string>? styleClass = null,
+        bool isSingleton = false)
+    {
+        return Add(
+            viewSettings.ViewType, null, routeName, displayName, icon, styleClass, isSingleton);
+    }
+
+    public CollapsedBuilder Add<TView, TViewModel>(
+        string routeName,
+        string displayName,
+        string icon,
+        AppView<TView, TViewModel> viewSettings,
+        List<string>? styleClass = null,
+        bool isSingleton = false)
+    {
+        return Add(
+            viewSettings.ViewType, viewSettings.ViewModelType, routeName, displayName, icon, styleClass, isSingleton);
+    }
 }