feat: working on detail views.

Sources/App/Controllers/View/EmployeeViewController.swift

@@ -13,7 +13,8 @@ struct EmployeeViewController: RouteCollection {
     protected.get("form", use: employeeForm(req:))
     protected.post(use: create(req:))
     protected.group(":employeeID") {
-      $0.get(use: edit(req:))
+      $0.get(use: get(req:))
+      $0.get("edit", use: edit(req:))
       $0.delete(use: delete(req:))
       $0.put(use: update(req:))
       $0.patch("toggle-active", use: toggleActive(req:))
@@ -22,15 +23,36 @@ struct EmployeeViewController: RouteCollection {
 
   @Sendable
   func index(req: Request) async throws -> View {
-    return try await req.view.render("employees/index", EmployeesCTX(db: employees))
+    return try await renderIndex(req)
+  }
+
+  @Sendable
+  private func renderIndex(
+    _ req: Request,
+    _ employee: Employee.DTO? = nil,
+    _ form: EmployeeFormCTX? = nil
+  ) async throws -> View {
+    return try await req.view.render(
+      "employees/index",
+      EmployeesCTX(employee: employee, employees: employees.fetchAll(), form: form ?? .init())
+    )
   }
 
   @Sendable
   func create(req: Request) async throws -> View {
     try Employee.Create.validate(content: req)
-    let model = try req.content.decode(Employee.Create.self)
-    _ = try await employees.create(model)
-    return try await req.view.render("employees/index", EmployeesCTX(oob: true, db: employees))
+    let employee = try await employees.create(req.content.decode(Employee.Create.self))
+    return try await req.view.render("employees/table-row", employee)
+  }
+
+  @Sendable
+  func get(req: Request) async throws -> View {
+    let employee = try await employees.get(req.ensureIDPathComponent(key: "employeeID"))
+    // Check if we've rendered the page yet.
+    guard req.isHtmxRequest else {
+      return try await renderIndex(req, employee)
+    }
+    return try await req.view.render("employees/detail", ["employee": employee])
   }
 
   @Sendable
@@ -42,6 +64,7 @@ struct EmployeeViewController: RouteCollection {
     return try await req.view.render("employees/table-row", employee)
   }
 
+  // TODO: I think we can just return a response and remove the table-row, here.
   @Sendable
   func delete(req: Request) async throws -> View {
     let id = try req.requireEmployeeID()
@@ -55,7 +78,7 @@ struct EmployeeViewController: RouteCollection {
     guard let employee = try await employees.get(req.parameters.get("employeeID")) else {
       throw Abort(.notFound)
     }
-    return try await req.view.render("employees/form", EmployeeFormCTX(employee: employee))
+    return try await req.view.render("employees/detail", EmployeeDetailCTX(editing: true, employee: employee))
   }
 
   @Sendable
@@ -63,8 +86,10 @@ struct EmployeeViewController: RouteCollection {
     let id = try req.requireEmployeeID()
     try Employee.Update.validate(content: req)
     let updates = try req.content.decode(Employee.Update.self)
-    _ = try await employees.update(id, updates)
-    return try await req.view.render("employees/index", EmployeesCTX(oob: true, db: employees))
+    req.logger.info("Employee updates: \(updates)")
+    let employee = try await employees.update(id, updates)
+    req.logger.info("Done updating employee: \(employee)")
+    return try await req.view.render("employees/table-row", employee)
   }
 
   @Sendable
@@ -83,19 +108,29 @@ private extension Request {
   }
 }
 
+private struct EmployeeDetailCTX: Content {
+  let editing: Bool
+  let employee: Employee.DTO?
+
+  init(editing: Bool = false, employee: Employee.DTO? = nil) {
+    self.editing = editing
+    self.employee = employee
+  }
+}
+
 private struct EmployeesCTX: Content {
-  let oob: Bool
+  let employee: Employee.DTO?
   let employees: [Employee.DTO]
   let form: EmployeeFormCTX
 
   init(
-    oob: Bool = false,
-    employee: Employee? = nil,
-    db: EmployeeDB
-  ) async throws {
-    self.oob = oob
-    self.employees = try await db.fetchAll()
-    self.form = .init(employee: employee.map { $0.toDTO() })
+    employee: Employee.DTO? = nil,
+    employees: [Employee.DTO],
+    form: EmployeeFormCTX? = nil
+  ) {
+    self.employee = employee
+    self.employees = employees
+    self.form = form ?? .init()
   }
 }
 

Sources/App/Controllers/View/PurchaseOrderViewController.swift

@@ -3,16 +3,17 @@ import Fluent
 import Vapor
 
 struct PurchaseOrderViewController: RouteCollection {
+  @Dependency(\.employees) var employees
   @Dependency(\.purchaseOrders) var purchaseOrders
-
-  private let employeesApi = EmployeeApiController()
-  private let branches = VendorBranchDB()
-  private let api = ApiController()
+  @Dependency(\.vendorBranches) var vendorBranches
 
   func boot(routes: any RoutesBuilder) throws {
     let pos = routes.protected.grouped("purchase-orders")
 
     pos.get(use: index(req:))
+    pos.group("details", "close") {
+      $0.get(use: detailClose(req:))
+    }
     pos.post(use: create(req:))
     pos.group(":id") {
       $0.get(use: detail(req:))
@@ -25,8 +26,8 @@ struct PurchaseOrderViewController: RouteCollection {
     let purchaseOrdersPage = try await purchaseOrders.fetchPage(
       .init(page: params?.page ?? 1, per: params?.limit ?? 50)
     )
-    let branches = try await self.branches.getBranches(req: req)
-    let employees = try await employeesApi.index(req: req)
+    let branches = try await vendorBranches.getBranches(req: req)
+    let employees = try await employees.fetchAll()
     req.logger.debug("Branches: \(branches)")
     return try await req.view.render(
       "purchaseOrders/index",
@@ -43,7 +44,12 @@ struct PurchaseOrderViewController: RouteCollection {
       throw Abort(.badRequest, reason: "Id not supplied.")
     }
     let purchaseOrder = try await purchaseOrders.get(id)
-    return try await req.view.render("purchaseOrders/detail", ["purchaseOrder": purchaseOrder])
+    return try await req.view.render("purchaseOrders/detail", ["purchaseOrderDetail": purchaseOrder])
+  }
+
+  @Sendable
+  func detailClose(req: Request) async throws -> View {
+    return try await req.view.render("purchaseOrders/detail")
   }
 
   @Sendable
@@ -62,6 +68,7 @@ private struct PurchaseOrderIndex: Content {
 }
 
 private struct PurchaseOrderCTX: Content {
+  let purchaseOrderDetail: PurchaseOrder.DTO?
   let purchaseOrders: [PurchaseOrder.DTO]
   let page: Int
   let limit: Int
@@ -69,7 +76,12 @@ private struct PurchaseOrderCTX: Content {
   let hasPrevious: Bool
   let form: PurchaseOrderFormCTX?
 
-  init(page: Page<PurchaseOrder.DTO>, form: PurchaseOrderFormCTX?) {
+  init(
+    detail: PurchaseOrder.DTO? = nil,
+    page: Page<PurchaseOrder.DTO>,
+    form: PurchaseOrderFormCTX?
+  ) {
+    self.purchaseOrderDetail = detail
     self.purchaseOrders = page.items
     self.page = page.metadata.page
     self.limit = page.metadata.per

Sources/App/Controllers/View/UsersViewController.swift

@@ -1,31 +1,50 @@
+import Dependencies
 import Fluent
 import Vapor
 
 struct UserViewController: RouteCollection {
 
+  @Dependency(\.users) var users
+
   private let api = UserApiController()
 
   func boot(routes: any RoutesBuilder) throws {
     let users = routes.protected.grouped("users")
     users.get(use: index(req:))
     users.post(use: create(req:))
-    users.group(":userID") {
+    users.group(":id") {
+      $0.get(use: details(req:))
       $0.delete(use: delete(req:))
     }
   }
 
   @Sendable
   func index(req: Request) async throws -> View {
-    try await req.view.render(
-      "users/index",
-      UsersCTX(users: api.getSortedUsers(req: req))
-    )
+    try await renderIndex(req)
+  }
+
+  @Sendable
+  private func renderIndex(_ req: Request, _ user: User.DTO? = nil) async throws -> View {
+    let users = try await api.getSortedUsers(req: req)
+    return try await req.view.render("users/index", UsersCTX(user: user, users: users))
   }
 
   @Sendable
   func create(req: Request) async throws -> View {
-    _ = try await api.create(req: req)
-    return try await req.view.render("users/table", ["users": api.getSortedUsers(req: req)])
+    let user = try await api.create(req: req)
+    return try await req.view.render("users/table-row", user)
+  }
+
+  @Sendable
+  func details(req: Request) async throws -> View {
+    let user = try await users.get(req.ensureIDPathComponent())
+    // Check if the page has been rendered before.
+    guard req.isHtmxRequest else {
+      // Not an htmx-request, so render the whole page with the details.
+      return try await renderIndex(req, user)
+    }
+    // An htmx-request header was present, so just return the details,
+    return try await req.view.render("users/detail", ["user": user])
   }
 
   @Sendable
@@ -50,11 +69,11 @@ struct UserFormCTX: Content {
         formClass: "user-form",
         formId: "user-form",
         htmxTargetUrl: .post("/login\((next != nil && next != "/") ? "?next=\(next!)" : "")"),
-        htmxTarget: "body",
+        htmxTarget: "user-table",
         htmxPushUrl: true,
         htmxResetAfterRequest: true,
         htmxSwapOob: nil,
-        htmxSwap: nil,
+        htmxSwap: .afterbegin,
         context: .init(showConfirmPassword: false, showEmailInput: false, buttonLabel: "Sign In")
       )
     )
@@ -78,10 +97,16 @@ struct UserFormCTX: Content {
 }
 
 private struct UsersCTX: Content {
+  let user: User.DTO?
   let users: [User.DTO]
   let form: UserFormCTX
 
-  init(users: [User.DTO], form: UserFormCTX? = nil) {
+  init(
+    user: User.DTO? = nil,
+    users: [User.DTO],
+    form: UserFormCTX? = nil
+  ) {
+    self.user = user
     self.users = users
     self.form = form ?? .create()
   }