feat: implement hx-boost for reliable loading indication
This commit is contained in:
Björn Fromme
@@ -71,8 +71,7 @@ class IndexController extends AbstractController
|
||||
$password = $this->crypt->decrypt($user->getPassword());
|
||||
|
||||
// Load form data from session (or API on first load)
|
||||
$loadResult = $this->dataLoader->loadFormData($request, $id, $email, $password);
|
||||
$bookingDto = $loadResult['bookingDto'];
|
||||
$bookingDto = $this->dataLoader->loadFormData($request, $id, $email, $password);
|
||||
|
||||
if (null === $bookingDto) {
|
||||
$this->addFlash('error', 'Buchungsdaten nicht (mehr) verfügbar');
|
||||
@@ -80,16 +79,6 @@ class IndexController extends AbstractController
|
||||
return $this->redirectToRoute('app_bookings');
|
||||
}
|
||||
|
||||
// Show staleness warning if applicable
|
||||
if (null !== $loadResult['stalenessWarning']) {
|
||||
$this->addFlash('info', $loadResult['stalenessWarning']);
|
||||
}
|
||||
|
||||
// Reset staleness timer when first loading the cards view (not HTMX requests)
|
||||
if (false === $this->isHxRequest($request)) {
|
||||
$this->dataLoader->resetStalenessTimer($request, $bookingDto);
|
||||
}
|
||||
|
||||
// Fetch booking data for display (surcharges, canceled status, etc.)
|
||||
$bookingData = $this->dataLoader->fetchBookingData($email, $password, $id);
|
||||
if (null === $bookingData || $bookingData instanceof Notification) {
|
||||
@@ -129,17 +118,6 @@ class IndexController extends AbstractController
|
||||
'hasValidationErrors' => $form->isSubmitted() && false === $form->isValid(),
|
||||
];
|
||||
|
||||
// If HTMX request, render only blocks to avoid layout duplication
|
||||
if ($this->isHxRequest($request)) {
|
||||
return $this->htmxOobResponse(
|
||||
'booking/edit/index.html.twig',
|
||||
['participant_cards', 'booking_summary'],
|
||||
$templateData,
|
||||
$this->generateUrl('app_booking_edit', ['id' => $id])
|
||||
);
|
||||
}
|
||||
|
||||
// Regular request: render full template
|
||||
return $this->render('booking/edit/index.html.twig', $templateData);
|
||||
}
|
||||
|
||||
@@ -215,7 +193,7 @@ class IndexController extends AbstractController
|
||||
$this->addNotificationsAsFlashMessages($notifications);
|
||||
|
||||
// Redirect back to cards
|
||||
return $this->hxRedirect($request, $this->generateUrl('app_booking_edit', ['id' => $id]));
|
||||
return $this->redirectToRoute('app_booking_edit', ['id' => $id]);
|
||||
}
|
||||
|
||||
// Get complete summary data (pricing, rooms, CMS data)
|
||||
@@ -233,32 +211,10 @@ class IndexController extends AbstractController
|
||||
'summaryData' => $summaryData,
|
||||
'refreshRouteName' => 'app_booking_edit_participant_refresh',
|
||||
'refreshRouteParams' => ['id' => $id, 'index' => $index],
|
||||
'submitRouteName' => 'app_booking_edit_participant',
|
||||
'submitRouteParams' => ['id' => $id, 'index' => $index],
|
||||
'cancelRouteName' => 'app_booking_edit',
|
||||
'cancelRouteParams' => ['id' => $id],
|
||||
];
|
||||
|
||||
// HTMX request: render blocks only with OOB swap
|
||||
if ($this->isHxRequest($request)) {
|
||||
$response = $this->htmxOobResponse(
|
||||
'booking/_participant_form.html.twig',
|
||||
['participant_form', 'booking_summary'],
|
||||
$templateData,
|
||||
$this->generateUrl('app_booking_edit_participant', ['id' => $id, 'index' => $index])
|
||||
);
|
||||
|
||||
// Add notifications to render response if present
|
||||
if (false === empty($notifications)) {
|
||||
$response->headers->set('HX-Trigger', json_encode([
|
||||
'showNotifications' => $notifications,
|
||||
]));
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
// Regular request: render full template
|
||||
return $this->render('booking/edit/participant.html.twig', $templateData);
|
||||
}
|
||||
|
||||
@@ -331,8 +287,6 @@ class IndexController extends AbstractController
|
||||
'summaryData' => $summaryData,
|
||||
'refreshRouteName' => 'app_booking_edit_participant_refresh',
|
||||
'refreshRouteParams' => ['id' => $id, 'index' => $index],
|
||||
'submitRouteName' => 'app_booking_edit_participant',
|
||||
'submitRouteParams' => ['id' => $id, 'index' => $index],
|
||||
'cancelRouteName' => 'app_booking_edit',
|
||||
'cancelRouteParams' => ['id' => $id],
|
||||
]
|
||||
@@ -350,40 +304,56 @@ class IndexController extends AbstractController
|
||||
|
||||
/**
|
||||
* Reloads booking data from API, discarding all session changes.
|
||||
*
|
||||
* GET: Returns modal HTML for confirmation
|
||||
* POST: Clears session and redirects to reload the booking
|
||||
*/
|
||||
#[Route(
|
||||
path: '/bookings/{id}/edit/reload',
|
||||
name: 'app_booking_edit_reload',
|
||||
requirements: ['id' => '\d+'],
|
||||
methods: ['POST']
|
||||
requirements: ['id' => '\d+']
|
||||
)]
|
||||
#[IsGranted('ROLE_USER')]
|
||||
public function reloadFromApi(int $id, Request $request): Response
|
||||
{
|
||||
// Clear session to discard all changes
|
||||
$this->bookingService->clearBookingDto($request, BookingDto::MODE_EDIT);
|
||||
if (Request::METHOD_POST === $request->getMethod()) {
|
||||
// Clear session to discard all changes
|
||||
$this->bookingService->clearBookingDto($request, BookingDto::MODE_EDIT);
|
||||
|
||||
$this->addFlash('success', 'Änderungen verworfen, Daten neu geladen');
|
||||
$this->addFlash('success', 'Änderungen verworfen, Daten neu geladen');
|
||||
|
||||
return $this->hxRedirect($request, $this->generateUrl('app_booking_edit', ['id' => $id]));
|
||||
return $this->redirectToRoute('app_booking_edit', ['id' => $id]);
|
||||
}
|
||||
|
||||
return $this->render('booking/edit/modal_reload.html.twig', [
|
||||
'bookingId' => $id,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles "Zurück" button - clears session and returns to bookings list.
|
||||
* Handles "Zurück" button - shows confirmation modal or clears session.
|
||||
*
|
||||
* GET: Returns modal HTML for confirmation
|
||||
* POST: Clears session and redirects to bookings list
|
||||
*/
|
||||
#[Route(
|
||||
path: '/bookings/{id}/edit/cancel',
|
||||
name: 'app_booking_edit_cancel',
|
||||
requirements: ['id' => '\d+'],
|
||||
methods: ['POST']
|
||||
requirements: ['id' => '\d+']
|
||||
)]
|
||||
#[IsGranted('ROLE_USER')]
|
||||
public function cancelEdit(Request $request): Response
|
||||
public function cancelEdit(int $id, Request $request): Response
|
||||
{
|
||||
// Clear session to discard dirty state
|
||||
$this->bookingService->clearBookingDto($request, BookingDto::MODE_EDIT);
|
||||
if (Request::METHOD_POST === $request->getMethod()) {
|
||||
// Clear session to discard dirty state
|
||||
$this->bookingService->clearBookingDto($request, BookingDto::MODE_EDIT);
|
||||
|
||||
return $this->hxRedirect($request, $this->generateUrl('app_bookings'));
|
||||
return $this->redirectToRoute('app_bookings');
|
||||
}
|
||||
|
||||
return $this->render('booking/edit/modal_cancel.html.twig', [
|
||||
'bookingId' => $id,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -420,7 +390,7 @@ class IndexController extends AbstractController
|
||||
'booking_id' => $id,
|
||||
]);
|
||||
|
||||
return $this->hxRedirect($request, $this->generateUrl('app_booking_edit', ['id' => $id]));
|
||||
return $this->redirectToRoute('app_booking_edit', ['id' => $id]);
|
||||
}
|
||||
} catch (TimeoutException $e) {
|
||||
$this->addFlash('error', 'Die Anfrage hat zu lange gedauert. Bitte versuchen Sie es erneut.');
|
||||
@@ -433,6 +403,6 @@ class IndexController extends AbstractController
|
||||
$this->addFlash('error', 'Es ist ein Fehler in der Kommunikation mit dem Buchungssystem aufgetreten');
|
||||
}
|
||||
|
||||
return $this->hxRedirect($request, $this->generateUrl('app_booking_edit', ['id' => $id]));
|
||||
return $this->redirectToRoute('app_booking_edit', ['id' => $id]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user