fix: Search button would stay on top of sidepanel when it was open.
This commit is contained in:
@@ -13,7 +13,6 @@ struct PurchaseOrderSearchViewController: RouteCollection {
|
||||
func boot(routes: any RoutesBuilder) throws {
|
||||
let route = routes.protected.grouped("purchase-orders", "search")
|
||||
route.get(use: index)
|
||||
// route.get("form", use: form)
|
||||
route.post(use: post)
|
||||
}
|
||||
|
||||
@@ -21,7 +20,7 @@ struct PurchaseOrderSearchViewController: RouteCollection {
|
||||
func index(req: Request) async throws -> HTMLResponse {
|
||||
let query = try? req.query.decode(FormQuery.self)
|
||||
let html = PurchaseOrderSearch(context: query?.context)
|
||||
guard req.isHtmxRequest else {
|
||||
if query?.table == true || !req.isHtmxRequest {
|
||||
return await req.render { mainPage(search: html) }
|
||||
}
|
||||
return await req.render { html }
|
||||
@@ -34,17 +33,6 @@ struct PurchaseOrderSearchViewController: RouteCollection {
|
||||
return await req.render { PurchaseOrderTable(page: results, context: .search, searchContext: nil) }
|
||||
}
|
||||
|
||||
//
|
||||
// @Sendable
|
||||
// func form(req: Request) async throws -> HTMLResponse {
|
||||
// let query = try req.query.decode(FormQuery.self)
|
||||
// let html = PurchaseOrderSearch(context: query.context)
|
||||
// guard req.isHtmxRequest else {
|
||||
// return await req.render { mainPage(search: html) }
|
||||
// }
|
||||
// return await req.render { PurchaseOrderSearch(context: query.context) }
|
||||
// }
|
||||
|
||||
func mainPage(search: PurchaseOrderSearch = .init()) -> some SendableHTMLDocument {
|
||||
MainPage(displayNav: true, route: .purchaseOrders) {
|
||||
div(.class("container"), .id("purchase-order-content")) {
|
||||
@@ -81,4 +69,5 @@ extension PurchaseOrderSearchContent {
|
||||
|
||||
private struct FormQuery: Content {
|
||||
let context: PurchaseOrderSearchContext
|
||||
let table: Bool?
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user