From a2f2ac96ed55cf668b43170bf7837eb371900253 Mon Sep 17 00:00:00 2001 From: Dave Long Date: Wed, 1 May 2024 21:22:32 +0100 Subject: [PATCH] Revert "Issue #3272629 by kelly.m.jacobs, alexpott, Abhijith S, imclean, heni_deepak, azinck: Media Library widget display doesn't return to first page on applying filters" This reverts commit 09af975434cde63becc6c35a82af7a1a910be6bb. --- .../media_library/media_library.module | 2 -- .../FunctionalJavascript/WidgetViewsTest.php | 21 ++----------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/core/modules/media_library/media_library.module b/core/modules/media_library/media_library.module index 34865772eb8d..2ad0f0fef334 100644 --- a/core/modules/media_library/media_library.module +++ b/core/modules/media_library/media_library.module @@ -214,8 +214,6 @@ function media_library_views_post_render(ViewExecutable $view, &$output, CachePl $ajax_path = &$output['#attached']['drupalSettings']['views']['ajax_path']; $parsed_url = UrlHelper::parse($ajax_path); $query = array_merge($query, $parsed_url['query']); - // Reset the pager so that the user starts on the first page. - unset($query['page']); $ajax_path = $parsed_url['path'] . '?' . UrlHelper::buildQuery($query); } } diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php index dd8e58a2a9ad..0cbb6325452a 100644 --- a/core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php +++ b/core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php @@ -116,25 +116,7 @@ class WidgetViewsTest extends MediaLibraryTestBase { $assert_session->pageTextContains('Bear'); $assert_session->pageTextNotContains('Turtle'); - // Assert the exposed filters can be applied and page is reset from second - // page. - $page->clickLink('Next page'); - $this->waitForElementTextContains('.js-media-library-view .js-pager__items > li:nth-of-type(2)', 'Page 2'); - $page->fillField('Name', 'Bear'); - $page->pressButton('Apply filters'); - $assert_session->assertWaitOnAjaxRequest(); - $assert_session->pageTextNotContains('Dog'); - $assert_session->pageTextContains('Bear'); - $assert_session->pageTextNotContains('Turtle'); - - // Test clearing the filters. - $page->fillField('Name', ''); - $page->pressButton('Apply filters'); - $assert_session->waitForLink('Next page'); - $page->clickLink('Next page'); - $this->waitForElementTextContains('.js-media-library-view .js-pager__items > li:nth-of-type(2)', 'Page 2'); - - // Assert the exposed filters are persisted when changing display. + // Assert the exposed filters can be applied. $page->fillField('Name', 'Dog'); $page->pressButton('Apply filters'); $assert_session->assertWaitOnAjaxRequest(); @@ -145,6 +127,7 @@ class WidgetViewsTest extends MediaLibraryTestBase { $assert_session->linkExists('Table'); $this->switchToMediaLibraryGrid(); + // Assert the exposed filters are persisted when changing display. $this->assertSame('Dog', $page->findField('Name')->getValue()); $assert_session->pageTextContains('Dog'); $assert_session->pageTextNotContains('Crocodile');