feat: working on detail views.
This commit is contained in:
@@ -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()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user