From 3e486f783a9e95ebe4264bfd26f172ddfe8e4fcb Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 5 May 2024 21:50:14 +0100
Subject: [PATCH] Issue #3441920 by scott_euser, catch, smustgrave, quietone:
Support #attached settings in ViewAjaxController
---
.../views/src/Controller/ViewAjaxController.php | 4 ++++
.../Unit/Controller/ViewAjaxControllerTest.php | 17 ++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/core/modules/views/src/Controller/ViewAjaxController.php b/core/modules/views/src/Controller/ViewAjaxController.php
index 54310f68df8b..a4a3d2538dc2 100644
--- a/core/modules/views/src/Controller/ViewAjaxController.php
+++ b/core/modules/views/src/Controller/ViewAjaxController.php
@@ -214,6 +214,10 @@ public function ajaxView(Request $request) {
$response->addCommand(new PrependCommand(".js-view-dom-id-$dom_id", ['#type' => 'status_messages']));
$request->query->set('ajax_page_state', $existing_page_state);
+ if (!empty($preview['#attached'])) {
+ $response->setAttachments($preview['#attached']);
+ }
+
return $response;
}
else {
diff --git a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
index aff3dc6696da..10ec7fc29516 100644
--- a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
+++ b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
@@ -209,6 +209,14 @@ public function testAjaxView() {
$this->assertSame($response->getView(), $executable);
$this->assertViewResultCommand($response);
+
+ // Test that the ajax controller for Views contains the
+ // Drupal Settings.
+ $this->assertEquals([
+ 'drupalSettings' => [
+ 'testSetting' => ['Setting'],
+ ],
+ ], $response->getAttachments());
}
/**
@@ -389,7 +397,14 @@ protected function setupValidMocks($use_ajax = self::USE_AJAX) {
->willReturn(TRUE);
$executable->expects($this->atMost(1))
->method('preview')
- ->willReturn(['#markup' => 'View result']);
+ ->willReturn([
+ '#markup' => 'View result',
+ '#attached' => [
+ 'drupalSettings' => [
+ 'testSetting' => ['Setting'],
+ ],
+ ],
+ ]);
$this->executableFactory->expects($this->once())
->method('get')
--
GitLab