Add pageHandles to AJAX calls

Author: jissereitsma

Controller/Index/Html.php

@@ -56,7 +56,7 @@ public function execute(): ResultInterface|ResponseInterface
     {
         $data = $this->requestDataLoader->load();
         $this->requestDataLoader->mergeRequestParams();
-        $layout = $this->layoutLoader->load($data['handles'], [], true);
+        $layout = $this->layoutLoader->load($data['handles'], $data['pageHandles'], true);
 
         $updates = $this->getComponentUpdates($data['updates'], $layout);
         $updates = $this->sortUpdates($updates);
@@ -72,6 +72,7 @@ public function execute(): ResultInterface|ResponseInterface
                 );
             } catch (NoBlockFoundException $exception) {
                 $this->logger->critical($exception);
+                $this->addExceptionMessage($exception);
 
             } catch (RedirectException $redirectException) {
                 return $this->getJsonRedirect($redirectException);

Util/ComponentUtil.php

@@ -42,6 +42,11 @@ public function getHandles(AbstractBlock $block): array
         return $block->getLayout()->getUpdate()->getHandles();
     }
 
+    public function getPageHandles(AbstractBlock $block): array
+    {
+        return [$block->getLayout()->getUpdate()->getPageLayout()];
+    }
+
     public function getRequestData(): array
     {
         /** @var Http $request */

view/base/templates/script/ajax-queue.phtml

@@ -165,6 +165,9 @@ if ($interval < 10) {
                 handles: <?= /* @noEscape */ json_encode(
                     $componentUtil->getHandles($block)
                 ) ?>,
+                pageHandles: <?= /* @noEscape */ json_encode(
+                    $componentUtil->getPageHandles($block)
+                ) ?>,
                 request: <?= /* @noEscape */ json_encode(
                     $componentUtil->getRequestData()
                 ) ?>