Merge pull request #98 from nodes-vapor/hotfix/menu-path-from-generator

Menu paths are now defined by the generator

Author: rasmusebbesen

Sources/AdminPanel/Configs/AdminPanelConfig.swift

@@ -32,7 +32,7 @@ public struct AdminPanelConfig<U: AdminPanelUserType>: Service {
     public let endpoints: AdminPanelEndpoints
     public let views: AdminPanelViews
     public let controllers: AdminPanelControllers<U>
-    public let sidebarMenuPathGenerator: SidebarMenuPathGenerator
+    public let sidebarMenuPathGenerator: SidebarMenuPathGenerator<U.Role>
     public let dashboardPath: String?
     public let resetPasswordEmail: ResetPasswordEmail
     public let specifyPasswordEmail: SpecifyPasswordEmail
@@ -44,7 +44,7 @@ public struct AdminPanelConfig<U: AdminPanelUserType>: Service {
         endpoints: AdminPanelEndpoints = .default,
         views: AdminPanelViews = .default,
         controllers: AdminPanelControllers<U> = .default,
-        sidebarMenuPathGenerator: @escaping SidebarMenuPathGenerator = U.Role.menuPathGenerator,
+        sidebarMenuPathGenerator: @escaping SidebarMenuPathGenerator<U.Role> = U.Role.sidebarMenuPathGenerator,
         dashboardPath: String? = nil,
         resetPasswordEmail: ResetPasswordEmail = .default,
         specifyPasswordEmail: SpecifyPasswordEmail = .default,

Sources/AdminPanel/Models/AdminPanelUserType.swift

@@ -3,7 +3,7 @@ import Reset
 import Submissions
 import Sugar
 
-public typealias SidebarMenuPathGenerator = ((AdminPanelUserRole) -> String)
+public typealias SidebarMenuPathGenerator<U: AdminPanelUserRoleType> = ((U) -> String)
 
 public protocol AdminPanelUserType:
     Parameter,
@@ -42,7 +42,7 @@ public extension AdminPanelUserType {
 }
 
 public extension AdminPanelUserRoleType {
-    public static var menuPathGenerator: SidebarMenuPathGenerator {
+    public static var sidebarMenuPathGenerator: SidebarMenuPathGenerator<Self> {
         return { role in
             role.menuPath
         }

Sources/AdminPanel/Providers/AdminPanelProvider.swift

@@ -116,7 +116,8 @@ public final class AdminPanelProvider<U: AdminPanelUserType>: Provider {
 
         services.register(AdminPanelConfigTagData<U>(
             name: config.name,
-            baseUrl: config.baseUrl
+            baseUrl: config.baseUrl,
+            sidebarMenuPathGenerator: config.sidebarMenuPathGenerator
         ))
         services.register(config)
         services.register(KeyedCacheSessions.self)

Sources/AdminPanel/Tags/AdminPanelConfigTag.swift

@@ -10,7 +10,11 @@ public final class AdminPanelConfigTag<U: AdminPanelUserType>: TagRenderer {
         let container = try tag.container.make(CurrentUserContainer<U>.self)
 
         return Future.map(on: tag) {
-            try config.viewData(for: tag.parameters[0], user: container.user, tag: tag)
+            try config.viewData(
+                for: tag.parameters[0],
+                user: container.user,
+                tag: tag
+            )
         }
     }
 
@@ -28,14 +32,17 @@ public final class AdminPanelConfigTagData<U: AdminPanelUserType>: Service {
     public var name = ""
     public var baseUrl = ""
     public var dashboardPath: String?
+    public var sidebarMenuPathGenerator: SidebarMenuPathGenerator<U.Role>
 
     init(
         name: String,
         baseUrl: String,
+        sidebarMenuPathGenerator: @escaping SidebarMenuPathGenerator<U.Role>,
         dashboardPath: String? = nil
     ) {
         self.name = name
         self.baseUrl = baseUrl
+        self.sidebarMenuPathGenerator = sidebarMenuPathGenerator
         self.dashboardPath = dashboardPath
     }
 
@@ -54,7 +61,9 @@ public final class AdminPanelConfigTagData<U: AdminPanelUserType>: Service {
         case .baseUrl:
             return .string(baseUrl)
         case .sidebarMenuPath:
-            return user.map { .string($0.role.menuPath) } ?? .null
+            return user.map {
+                .string(self.sidebarMenuPathGenerator($0.role))
+            } ?? .null
         case .dashboardPath:
             return dashboardPath.map { .string($0) } ?? .null
         }