From c00e78464bd7c7d714c57c693ff4056314c90e8e Mon Sep 17 00:00:00 2001 From: Diego Pino Navarro Date: Wed, 6 Dec 2023 12:03:19 -0500 Subject: [PATCH 1/4] Deprecated ScrollTopCommand + where to find your arguments in the ... Symfony bag ... thanks Drupal 10.1 ... --- .../FormatStrawberryfieldViewAjaxController.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/format_strawberryfield_views/src/Controller/FormatStrawberryfieldViewAjaxController.php b/modules/format_strawberryfield_views/src/Controller/FormatStrawberryfieldViewAjaxController.php index cfeec987..3e4ed77f 100644 --- a/modules/format_strawberryfield_views/src/Controller/FormatStrawberryfieldViewAjaxController.php +++ b/modules/format_strawberryfield_views/src/Controller/FormatStrawberryfieldViewAjaxController.php @@ -14,7 +14,7 @@ use Drupal\Core\Render\RenderContext; use Drupal\Core\Render\RendererInterface; use Drupal\Core\Routing\RedirectDestinationInterface; -use Drupal\views\Ajax\ScrollTopCommand; +use Drupal\Core\Ajax\ScrollTopCommand; use Drupal\views\Ajax\ViewAjaxResponse; use Drupal\views\ViewExecutableFactory; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -122,10 +122,10 @@ public static function create(ContainerInterface $container) { * Thrown when the view was not found. */ public function ajaxView(Request $request) { - $name = $request->request->get('view_name'); - $display_id = $request->request->get('view_display_id'); + $name = $request->get('view_name'); + $display_id = $request->get('view_display_id'); if (isset($name) && isset($display_id)) { - $args = $request->request->get('view_args', ''); + $args = $request->get('view_args', ''); $args = $args !== '' ? explode('/', Html::decodeEntities($args)) : []; // Arguments can be empty, make sure they are passed on as NULL so that @@ -134,15 +134,15 @@ public function ajaxView(Request $request) { return ($arg == '' ? NULL : $arg); }, $args); - $path = $request->request->get('view_path'); + $path = $request->get('view_path'); // If a view has an invalid Path (e.g you added some % somewhere) this will be null. $target_url = $this->pathValidator->getUrlIfValid($path); - $dom_id = $request->request->get('view_dom_id'); + $dom_id = $request->get('view_dom_id'); $dom_id = isset($dom_id) ? preg_replace('/[^a-zA-Z0-9_-]+/', '-', $dom_id) : NULL; - $pager_element = $request->request->get('pager_element'); + $pager_element = $request->get('pager_element'); $pager_element = isset($pager_element) ? intval($pager_element) : NULL; // Assume its there if not told otherwise - $exposed_form_display = (bool) $request->request->get('exposed_form_display', TRUE); + $exposed_form_display = (bool) $request->get('exposed_form_display', TRUE); $response = new ViewAjaxResponse(); From 727b9bd45e6232d4eaea389886624401258127a0 Mon Sep 17 00:00:00 2001 From: Diego Pino Navarro Date: Wed, 6 Dec 2023 12:03:42 -0500 Subject: [PATCH 2/4] Nothing can be trusted anymore options.data might be null, undefined, etc. Who knows --- .../format_strawberryfield_views/js/modal-exposed-form-ajax.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/format_strawberryfield_views/js/modal-exposed-form-ajax.js b/modules/format_strawberryfield_views/js/modal-exposed-form-ajax.js index e30adee0..7f6ac3b3 100644 --- a/modules/format_strawberryfield_views/js/modal-exposed-form-ajax.js +++ b/modules/format_strawberryfield_views/js/modal-exposed-form-ajax.js @@ -230,6 +230,9 @@ options.data = $.param(params); } else { + if ((options.data == null) || (typeof(options.data) == 'undefined')) { + options.data = {}; + } options.data['exposed_form_display'] = $exposed_form; } } From a30aec4b6c52b7fbcea34ee79f6b81e7e4702bc1 Mon Sep 17 00:00:00 2001 From: Diego Pino Navarro Date: Wed, 6 Dec 2023 12:03:53 -0500 Subject: [PATCH 3/4] Fix a PHP DOC typo (really) --- .../src/Controller/ViewsExposedFormModalBlockAjaxController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/format_strawberryfield_views/src/Controller/ViewsExposedFormModalBlockAjaxController.php b/modules/format_strawberryfield_views/src/Controller/ViewsExposedFormModalBlockAjaxController.php index 00032b72..b9782175 100644 --- a/modules/format_strawberryfield_views/src/Controller/ViewsExposedFormModalBlockAjaxController.php +++ b/modules/format_strawberryfield_views/src/Controller/ViewsExposedFormModalBlockAjaxController.php @@ -18,7 +18,7 @@ use Symfony\Component\Routing\RouterInterface; /** - * Defines a controller to load an Modal Exposed Views Form Block via AJAX. + * Defines a controller to load a Modal Exposed Views Form Block via AJAX. */ class ViewsExposedFormModalBlockAjaxController extends ControllerBase { From 9598e9b47f99fdcb242cff51b6858fdc740303d1 Mon Sep 17 00:00:00 2001 From: Diego Pino Navarro Date: Mon, 8 Jan 2024 14:15:16 -0500 Subject: [PATCH 4/4] D10.1 + dependency in composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index c2cf84d5..1cf55f5e 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,7 @@ } ], "require": { + "drupal/core":"^10.1", "strawberryfield/strawberryfield":"1.3.0.x-dev", "league/html-to-markdown":"^5.0.0", "erusev/parsedown": "^1.7",